b_dr equivalent, update dtk-template (#2327)

* 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
+19 -19
View File
@@ -89,7 +89,7 @@ static void e_yc_fly(e_yc_class* i_this) {
case 0:
if (i_this->mTimer[0] == 0 && frame == 14) {
i_this->mFlyAnmMode = 1;
anm_init(i_this, e_yc_class::ANM_FLY_GLIDE, 12.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, e_yc_class::ANM_FLY_GLIDE, 12.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mTimer[0] = cM_rndF(70.0f) + 70.0f;
}
break;
@@ -97,7 +97,7 @@ static void e_yc_fly(e_yc_class* i_this) {
case 1:
if (i_this->mTimer[0] == 0) {
i_this->mFlyAnmMode = 0;
anm_init(i_this, e_yc_class::ANM_FLY, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, e_yc_class::ANM_FLY, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mTimer[0] = cM_rndF(70.0f) + 70.0f;
}
break;
@@ -134,7 +134,7 @@ static void e_yc_fly(e_yc_class* i_this) {
i_this->mTargetPos = i_this->home.pos;
i_this->mMaxAngleSpeed = 200.0f;
i_this->mAngleXSpeedRatio = 0.0f;
anm_init(i_this, e_yc_class::ANM_FLY_GLIDE, 0.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, e_yc_class::ANM_FLY_GLIDE, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mFlyAnmMode = 2;
break;
@@ -151,10 +151,10 @@ static void e_yc_fly(e_yc_class* i_this) {
case 4:
accel = 0.3f;
if (rider->mDemoTimer == 30) {
anm_init(i_this, e_yc_class::ANM_FLY_BRAKE, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, e_yc_class::ANM_FLY_BRAKE, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
}
if (rider->mDemoTimer == 60) {
anm_init(i_this, e_yc_class::ANM_HOVERING, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, e_yc_class::ANM_HOVERING, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
}
i_this->mMaxAngleSpeed = 300.0f;
break;
@@ -203,7 +203,7 @@ static void e_yc_f_fly(e_yc_class* i_this) {
case 0:
if (i_this->mTimer[0] == 0 && frame == 14) {
i_this->mFlyAnmMode = 1;
anm_init(i_this, e_yc_class::ANM_FLY_GLIDE, 12.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, e_yc_class::ANM_FLY_GLIDE, 12.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mTimer[0] = cM_rndF(70.0f) + 70.0f;
}
break;
@@ -211,7 +211,7 @@ static void e_yc_f_fly(e_yc_class* i_this) {
case 1:
if (i_this->mTimer[0] == 0) {
i_this->mFlyAnmMode = 0;
anm_init(i_this, e_yc_class::ANM_FLY, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, e_yc_class::ANM_FLY, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mTimer[0] = cM_rndF(70.0f) + 70.0f;
}
break;
@@ -282,7 +282,7 @@ static void e_yc_hovering(e_yc_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, e_yc_class::ANM_HOVERING, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, e_yc_class::ANM_HOVERING, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 1;
i_this->mTimer[0] = cM_rndF(100.0f) + 200.0f;
break;
@@ -339,7 +339,7 @@ static void e_yc_attack(e_yc_class* i_this) {
target_speed = 30.0f;
if (delta.abs() < 1000.0f) {
i_this->mMode = 2;
anm_init(i_this, e_yc_class::ANM_FLY_BRAKE, 10.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, e_yc_class::ANM_FLY_BRAKE, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMaxAngleSpeed = 1000.0f;
i_this->mCreatureSound.startCreatureVoice(Z2SE_EN_YC_V_ATTACK, -1);
}
@@ -355,7 +355,7 @@ static void e_yc_attack(e_yc_class* i_this) {
case 3:
if (i_this->mTimer[0] == 0) {
anm_init(i_this, e_yc_class::ANM_CATCH_START, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, e_yc_class::ANM_CATCH_START, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = 4;
}
break;
@@ -376,7 +376,7 @@ static void e_yc_attack(e_yc_class* i_this) {
i_this->mMode = 0;
} else {
anm_init(i_this, e_yc_class::ANM_CATCH_MIDDLE, 5.0f,
J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 5;
i_this->mTimer[0] = 80;
}
@@ -385,7 +385,7 @@ static void e_yc_attack(e_yc_class* i_this) {
case 5:
if (i_this->mTimer[0] == 0) {
anm_init(i_this, e_yc_class::ANM_CATCH_END, 5.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, e_yc_class::ANM_CATCH_END, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = 6;
} else {
i_this->current.pos.y += 5.0f;
@@ -445,7 +445,7 @@ static void e_yc_wolfbite(e_yc_class* i_this) {
switch (i_this->mMode) {
case 0:
anm_init(i_this, e_yc_class::ANM_HANGED, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, e_yc_class::ANM_HANGED, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = 1;
i_this->mCreatureSound.startCreatureVoice(Z2SE_EN_DN_V_DRAWBACK, -1);
_this->health -= 5;
@@ -454,25 +454,25 @@ static void e_yc_wolfbite(e_yc_class* i_this) {
case 1:
if (i_this->mpMorf->isStop()) {
anm_init(i_this, e_yc_class::ANM_HANGED_WAIT, 3.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, e_yc_class::ANM_HANGED_WAIT, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
i_this->mMode = 2;
}
break;
case 2:
if (i_this->mAnm == e_yc_class::ANM_HANGED_DAMAGE && i_this->mpMorf->isStop()) {
anm_init(i_this, e_yc_class::ANM_HANGED_WAIT, 3.0f, J3DFrameCtrl::LOOP_REPEAT_e, 1.0f);
anm_init(i_this, e_yc_class::ANM_HANGED_WAIT, 3.0f, J3DFrameCtrl::EMode_LOOP, 1.0f);
}
if (i_this->health <= 0 || i_this->checkWolfBiteDamage()) {
i_this->offWolfBiteDamage();
anm_init(i_this, e_yc_class::ANM_HANGED_DAMAGE, 2.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, e_yc_class::ANM_HANGED_DAMAGE, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->health -= 5;
if (_this->health <= 0) {
player->offWolfEnemyHangBite();
anm_init(i_this, e_yc_class::ANM_HANGED_BRUSH2, 3.0f,
J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = 3;
rider->mDemoMode = 5;
dScnPly_c::setPauseTimer(7);
@@ -486,7 +486,7 @@ static void e_yc_wolfbite(e_yc_class* i_this) {
if (i_this->mWolfBiteDamageCount >= 5) {
player->offWolfEnemyHangBite();
anm_init(i_this, e_yc_class::ANM_HANGED_BRUSH, 3.0f,
J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = 3;
}
@@ -494,7 +494,7 @@ static void e_yc_wolfbite(e_yc_class* i_this) {
}
if (!player->checkWolfEnemyBiteAllOwn(_this)) {
anm_init(i_this, e_yc_class::ANM_HANGED_BRUSH, 3.0f, J3DFrameCtrl::LOOP_ONCE_e, 1.0f);
anm_init(i_this, e_yc_class::ANM_HANGED_BRUSH, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f);
i_this->mMode = 3;
}