mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-06 17:32:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge https://github.com/zeldaret/tp

Browse Source
This commit is contained in:
TakaRikka
2026-03-12 17:56:51 -07:00
parent 875b849c30 bc9bf9d062
commit cb85da153c
931 changed files with 25778 additions and 24285 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_npc_kn.cpp
+54 -54
View File
@@ -564,7 +564,7 @@ int daNpc_Kn_c::create() {
J3DModelData* model_data = mpModelMorf[0]->getModel()->getModelData();
fopAcM_SetMtx(this, mpModelMorf[0]->getModel()->getBaseTRMtx());
fopAcM_setCullSizeBox(this, -300.0f, -50.0f, -300.0f, 300.0f, 450.0f, 300.0f);
fopAcM_OnStatus(this, fopAcM_STATUS_UNK_0x8000000);
fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e);
mSound.init(&current.pos, &eyePos, 3, 1);
dKy_tevstr_init(&mTevStr, fopAcM_GetRoomNo(this), 0xFF);
@@ -869,7 +869,7 @@ void daNpc_Kn_c::reset() {
if (mType <= 6 && (mDivideNo == 0 || mDivideNo > 2)) {
field_0xe2c = 1;
parentActorID =
fopAcM_createChild(PROC_NPC_GWOLF, fopAcM_GetID(this), 0xFFFFFF02, &current.pos,
fopAcM_createChild(fpcNm_NPC_GWOLF_e, fopAcM_GetID(this), 0xFFFFFF02, &current.pos,
fopAcM_GetRoomNo(this), &current.angle, 0, -1, 0);
}
@@ -2361,7 +2361,7 @@ int daNpc_Kn_c::teach05_surpriseAttackWait(void* param_0) {
}
static void* s_sub6(void* i_actor, void* i_other) {
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_KN && i_actor != i_other) {
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_KN_e && i_actor != i_other) {
((daNpc_Kn_c*)i_actor)->setActionMode(18);
}
@@ -2369,7 +2369,7 @@ static void* s_sub6(void* i_actor, void* i_other) {
}
static void* s_subEnd6(void* i_actor, void* i_other) {
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_KN && i_actor != i_other &&
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_KN_e && i_actor != i_other &&
((daNpc_Kn_c*)i_actor)->getActionMode() != 17)
{
((daNpc_Kn_c*)i_actor)->setActionMode(17);
@@ -2617,7 +2617,7 @@ int daNpc_Kn_c::teach06_superJumpWaitDivide(void* param_0) {
if (mCylCc.ChkTgHit()) {
if (cut_type == daPy_py_c::CUT_TYPE_LARGE_JUMP || cut_type == daPy_py_c::CUT_TYPE_LARGE_JUMP_FINISH) {
mActionMode = 16;
daNpc_Kn_c* parent_p = (daNpc_Kn_c*)fpcM_SearchByID(parentActorID);
if (parent_p != NULL) {
parent_p->setTalkFlag(2);
@@ -2771,7 +2771,7 @@ int daNpc_Kn_c::teach06_warpDelete(void* param_0) {
}
static void* s_sub7(void* i_actor, void* i_other) {
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_KN && i_actor != i_other) {
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_KN_e && i_actor != i_other) {
((daNpc_Kn_c*)i_actor)->setActionMode(24);
}
@@ -2779,7 +2779,7 @@ static void* s_sub7(void* i_actor, void* i_other) {
}
static void* s_subEnd7(void* i_actor, void* i_other) {
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_KN && i_actor != i_other &&
if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == fpcNm_NPC_KN_e && i_actor != i_other &&
((daNpc_Kn_c*)i_actor)->getActionMode() != 23)
{
((daNpc_Kn_c*)i_actor)->setActionMode(23);
@@ -2996,7 +2996,7 @@ int daNpc_Kn_c::teach07_superTurnAttackWaitDivide(void* param_0) {
if (mCylCc.ChkTgHit()) {
if (cut_type == daPy_py_c::CUT_TYPE_LARGE_TURN_LEFT || cut_type == daPy_py_c::CUT_TYPE_LARGE_TURN_RIGHT) {
mActionMode = 22;
daNpc_Kn_c* parent_p = (daNpc_Kn_c*)fpcM_SearchByID(parentActorID);
if (parent_p != NULL) {
parent_p->setTalkFlag(2);
@@ -3137,7 +3137,7 @@ int daNpc_Kn_c::ECut_secondEncount(int i_idx) {
break;
case 2: {
gwolf_p = (daNpc_GWolf_c*)fpcM_SearchByID(parentActorID);
if (fopAcM_GetName(gwolf_p) == PROC_NPC_GWOLF) {
if (fopAcM_GetName(gwolf_p) == fpcNm_NPC_GWOLF_e) {
gwolf_p->setMotion(4, -1.0f, FALSE);
}
break;
@@ -3473,11 +3473,11 @@ int daNpc_Kn_c::ECut_thirdSkillGet(int i_idx) {
if (event_manager->getIsAddvance(i_idx)) {
switch (prm) {
case 0:
case 0:
daNpcT_offTmpBit(0xB);
daNpcT_offTmpBit(0xC);
break;
case 4:
case 4:
mFaceMotionSeqMngr.setNo(1, -1.0f, 0, 0);
if (mMotionSeqMngr.getNo() == 0x13) {
mMotionSeqMngr.setNo(0x16, -1.0f, 0, 0);
@@ -3485,7 +3485,7 @@ int daNpc_Kn_c::ECut_thirdSkillGet(int i_idx) {
mMotionSeqMngr.setNo(0x10, -1.0f, 0, 0);
}
break;
case 6:
case 6:
mJntAnm.lookNone(0);
break;
case 10: {
@@ -3522,7 +3522,7 @@ int daNpc_Kn_c::ECut_thirdSkillGet(int i_idx) {
}
}
switch (prm) {
case 0:
case 0:
if (speed.y <= 0.0f && mAcch.ChkGroundHit()) {
speedF = 0.0f;
speed.zero();
@@ -3538,7 +3538,7 @@ int daNpc_Kn_c::ECut_thirdSkillGet(int i_idx) {
rt = 1;
}
break;
case 2:
case 2:
if (mMotionSeqMngr.getNo() == 0x13 || mMotionSeqMngr.getNo() == 0xF) {
if (mMotionSeqMngr.getStepNo() > 0) {
rt = 1;
@@ -3547,12 +3547,12 @@ int daNpc_Kn_c::ECut_thirdSkillGet(int i_idx) {
}
}
break;
case 4:
case 4:
if ((mMotionSeqMngr.getNo() == 0x16 || mMotionSeqMngr.getNo() == 0x10) && mMotionSeqMngr.getStepNo() > 0) {
rt = 1;
}
break;
case 6:
case 6:
if (mCurAngle.y != fopAcM_searchPlayerAngleY(this)) {
if (step(fopAcM_searchPlayerAngleY(this), 1, 0x20, 20, 0)) {
rt = 1;
@@ -3609,10 +3609,10 @@ int daNpc_Kn_c::ECut_fourthSkillExplain(int i_idx) {
if (event_manager->getIsAddvance(i_idx)) {
switch (prm) {
case 0:
case 0:
mActionMode = 9;
break;
case 4:
case 4:
mFaceMotionSeqMngr.setNo(1, -1.0f, 0, 0);
if (mMotionSeqMngr.getNo() == 0x13) {
mMotionSeqMngr.setNo(0x16, -1.0f, 0, 0);
@@ -3620,10 +3620,10 @@ int daNpc_Kn_c::ECut_fourthSkillExplain(int i_idx) {
mMotionSeqMngr.setNo(16, -1.0f, 0, 0);
}
break;
case 6:
case 6:
mJntAnm.lookPlayer(0);
break;
case 10:
case 10:
mStepMode = 2;
initTalk(0x2EF, NULL);
break;
@@ -3633,7 +3633,7 @@ int daNpc_Kn_c::ECut_fourthSkillExplain(int i_idx) {
case 65: {
setPos(home.pos);
setAngle(home.angle.y);
cXyz sp64(-10.0f, 0.0f, 375.0f);
mDoMtx_stack_c::transS(home.pos);
mDoMtx_stack_c::YrotM(home.angle.y);
@@ -3786,7 +3786,7 @@ int daNpc_Kn_c::ECut_fourthSkillExplain(int i_idx) {
rt = 1;
}
break;
default:
default:
rt = 1;
break;
}
@@ -3948,7 +3948,7 @@ int daNpc_Kn_c::ECut_fifthSkillExplain(int i_idx) {
switch (prm) {
case 0:
break;
case 4:
case 4:
mFaceMotionSeqMngr.setNo(1, -1.0f, 0, 0);
if (mMotionSeqMngr.getNo() == 0x13) {
mMotionSeqMngr.setNo(0x16, -1.0f, 0, 0);
@@ -3956,10 +3956,10 @@ int daNpc_Kn_c::ECut_fifthSkillExplain(int i_idx) {
mMotionSeqMngr.setNo(16, -1.0f, 0, 0);
}
break;
case 6:
case 6:
mJntAnm.lookPlayer(0);
break;
case 10:
case 10:
mStepMode = 2;
initTalk(0x2E7, NULL);
break;
@@ -3978,7 +3978,7 @@ int daNpc_Kn_c::ECut_fifthSkillExplain(int i_idx) {
setPos(home.pos);
setAngle(home.angle.y);
cXyz sp64(0.0f, 0.0f, 375.0f);
mDoMtx_stack_c::transS(home.pos);
mDoMtx_stack_c::YrotM(home.angle.y);
@@ -4120,7 +4120,7 @@ int daNpc_Kn_c::ECut_fifthSkillExplain(int i_idx) {
mActionMode = 12;
}
break;
default:
default:
rt = 1;
break;
}
@@ -4282,7 +4282,7 @@ int daNpc_Kn_c::ECut_sixthSkillExplain(int i_idx) {
switch (prm) {
case 0:
break;
case 4:
case 4:
mFaceMotionSeqMngr.setNo(1, -1.0f, 0, 0);
if (mMotionSeqMngr.getNo() == 0x13) {
mMotionSeqMngr.setNo(0x16, -1.0f, 0, 0);
@@ -4290,10 +4290,10 @@ int daNpc_Kn_c::ECut_sixthSkillExplain(int i_idx) {
mMotionSeqMngr.setNo(16, -1.0f, 0, 0);
}
break;
case 6:
case 6:
mJntAnm.lookPlayer(0);
break;
case 10:
case 10:
mStepMode = 2;
initTalk(0x2F8, NULL);
break;
@@ -4303,7 +4303,7 @@ int daNpc_Kn_c::ECut_sixthSkillExplain(int i_idx) {
case 65: {
setPos(home.pos);
setAngle(home.angle.y);
cXyz sp64(0.0f, 0.0f, 375.0f);
mDoMtx_stack_c::transS(home.pos);
mDoMtx_stack_c::YrotM(home.angle.y);
@@ -4444,7 +4444,7 @@ int daNpc_Kn_c::ECut_sixthSkillExplain(int i_idx) {
if (mMotionSeqMngr.getNo() == 0x18 && mMotionSeqMngr.getStepNo() > 0) {
rt = 1;
for (int i = 0; i < 2; i++) {
fopAcM_createChild(PROC_NPC_KN, fopAcM_GetID(this), ((i + 1) << 8) + 6, &current.pos, fopAcM_GetRoomNo(this), &current.angle, NULL, -1, NULL);
fopAcM_createChild(fpcNm_NPC_KN_e, fopAcM_GetID(this), ((i + 1) << 8) + 6, &current.pos, fopAcM_GetRoomNo(this), &current.angle, NULL, -1, NULL);
}
}
break;
@@ -4454,7 +4454,7 @@ int daNpc_Kn_c::ECut_sixthSkillExplain(int i_idx) {
mActionMode = 13;
}
break;
default:
default:
rt = 1;
break;
}
@@ -4620,7 +4620,7 @@ int daNpc_Kn_c::ECut_seventhSkillExplain(int i_idx) {
switch (prm) {
case 0:
break;
case 4:
case 4:
mFaceMotionSeqMngr.setNo(1, -1.0f, 0, 0);
if (mMotionSeqMngr.getNo() == 0x13) {
mMotionSeqMngr.setNo(0x16, -1.0f, 0, 0);
@@ -4628,10 +4628,10 @@ int daNpc_Kn_c::ECut_seventhSkillExplain(int i_idx) {
mMotionSeqMngr.setNo(16, -1.0f, 0, 0);
}
break;
case 6:
case 6:
mJntAnm.lookPlayer(0);
break;
case 10:
case 10:
mStepMode = 2;
initTalk(0x300, NULL);
break;
@@ -4640,7 +4640,7 @@ int daNpc_Kn_c::ECut_seventhSkillExplain(int i_idx) {
setPos(home.pos);
setAngle(home.angle.y);
cXyz sp64(0.0f, 0.0f, 375.0f);
mDoMtx_stack_c::transS(home.pos);
mDoMtx_stack_c::YrotM(home.angle.y);
@@ -4776,7 +4776,7 @@ int daNpc_Kn_c::ECut_seventhSkillExplain(int i_idx) {
if (mMotionSeqMngr.getNo() == 0x18 && mMotionSeqMngr.getStepNo() > 0) {
rt = 1;
for (int i = 0; i < 2; i++) {
fopAcM_createChild(PROC_NPC_KN, fopAcM_GetID(this), ((i + 1) << 8) + 7, &current.pos, fopAcM_GetRoomNo(this), &current.angle, NULL, -1, NULL);
fopAcM_createChild(fpcNm_NPC_KN_e, fopAcM_GetID(this), ((i + 1) << 8) + 7, &current.pos, fopAcM_GetRoomNo(this), &current.angle, NULL, -1, NULL);
}
}
break;
@@ -4786,7 +4786,7 @@ int daNpc_Kn_c::ECut_seventhSkillExplain(int i_idx) {
mActionMode = 19;
}
break;
default:
default:
rt = 1;
break;
}
@@ -5018,7 +5018,7 @@ void daNpc_Kn_c::calcMagicBallPos() {
fopAc_ac_c* actor;
if (mType == 1 && fopAcM_SearchByID(parentActorID, &actor) && actor &&
fopAcM_GetName(actor) == PROC_KN_BULLET && ((daObjKnBullet_c*)actor)->getActionMode() == 0)
fopAcM_GetName(actor) == fpcNm_KN_BULLET_e && ((daObjKnBullet_c*)actor)->getActionMode() == 0)
{
cXyz pos(150.0f, 0.0f, 0.0f);
mDoMtx_stack_c::copy(mpModelMorf[0]->getModel()->getAnmMtx(13));
@@ -5265,20 +5265,20 @@ static actor_method_class daNpc_Kn_MethodTable = {
};
actor_process_profile_definition g_profile_NPC_KN = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_NPC_KN, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(daNpc_Kn_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
347, // mPriority
&daNpc_Kn_MethodTable, // sub_method
0x00044107, // mStatus
fopAc_ENEMY_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
/* Layer ID */ fpcLy_CURRENT_e,
/* List ID */ 7,
/* List Prio */ fpcPi_CURRENT_e,
/* Proc Name */ fpcNm_NPC_KN_e,
/* Proc SubMtd */ &g_fpcLf_Method.base,
/* Size */ sizeof(daNpc_Kn_c),
/* Size Other */ 0,
/* Parameters */ 0,
/* Leaf SubMtd */ &g_fopAc_Method.base,
/* Draw Prio */ fpcDwPi_NPC_KN_e,
/* Actor SubMtd */ &daNpc_Kn_MethodTable,
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_UNK_0x4000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x4_e | fopAcStts_UNK_0x2_e | fopAcStts_UNK_0x1_e,
/* Group */ fopAc_ENEMY_e,
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
};
AUDIO_INSTANCES;