mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-18 12:52:51 -04:00
Actor status consolidation & process profile definition editing (#3117)
* Consolidate fopAcM_STATUS into fopAc_Status_e * Add _e suffix to fopAcStts enums * Prepare for profile enumeration * Correct typo in scene_process_profile_definition * Manually handle g_profile_Obj_DamCps (inline preprocessing) * Correct g_profile_TAG_LV5SOUP procname to enum * Create d_priority.h * Update process profile definitions * Moved inline comments to the left * Add missing fopAcStts enums * Add d_priority.h include in f_pc_leaf.h * Manually update d_a_obj_damCps profile * Replace fopAcStts enums replacing and anticipatory profile size correction * Changed profile size from literal to sizeof() in anticipation of PR #3116 * Provided putative names to staff-related status enums * Replaced appropriate literals with fopAcStts enums * Fix borked merge * Rename item number enums and move to d_item_data.h * Rename process profile name & draw priority enums * Move process profile name & draw priority enums to appropriate files * Moved fpcNm_ enums from d/d_procname.h to f_pc/f_pc_name.h * Moved fpcDwPi_ enums from d/d_priority.h to f_pc/f_pc_draw_priority.h * ACTUALLY (whoops) stage merge * Correct item mistranslation Co-authored-by: LagoLunatic <LagoLunatic@users.noreply.github.com> --------- Co-authored-by: LagoLunatic <LagoLunatic@users.noreply.github.com>
This commit is contained in:
Huitzi
@@ -1195,65 +1195,65 @@ void daNpc_Besu_c::srchActors() {
|
||||
switch (mType) {
|
||||
case 0:
|
||||
if (mActorMngr[0].getActorP() == NULL) {
|
||||
mActorMngr[0].entry(getNearestActorP(PROC_NPC_TARO));
|
||||
mActorMngr[0].entry(getNearestActorP(fpcNm_NPC_TARO_e));
|
||||
}
|
||||
if (mActorMngr[1].getActorP() == NULL) {
|
||||
mActorMngr[1].entry(getNearestActorP(PROC_NPC_MARO));
|
||||
mActorMngr[1].entry(getNearestActorP(fpcNm_NPC_MARO_e));
|
||||
return;
|
||||
}
|
||||
break;
|
||||
case 2:
|
||||
if (mActorMngr[3].getActorP() == NULL) {
|
||||
// LEN is Renaldo
|
||||
mActorMngr[3].entry(getNearestActorP(PROC_NPC_LEN));
|
||||
mActorMngr[3].entry(getNearestActorP(fpcNm_NPC_LEN_e));
|
||||
return;
|
||||
}
|
||||
break;
|
||||
case 11:
|
||||
if (mActorMngr[0].getActorP() == NULL) {
|
||||
mActorMngr[0].entry(getNearestActorP(PROC_NPC_TARO));
|
||||
mActorMngr[0].entry(getNearestActorP(fpcNm_NPC_TARO_e));
|
||||
}
|
||||
if (mActorMngr[1].getActorP() == NULL) {
|
||||
mActorMngr[1].entry(getNearestActorP(PROC_NPC_MARO));
|
||||
mActorMngr[1].entry(getNearestActorP(fpcNm_NPC_MARO_e));
|
||||
return;
|
||||
}
|
||||
break;
|
||||
case 12:
|
||||
if (mActorMngr[0].getActorP() == NULL) {
|
||||
mActorMngr[0].entry(getNearestActorP(PROC_NPC_TARO));
|
||||
mActorMngr[0].entry(getNearestActorP(fpcNm_NPC_TARO_e));
|
||||
}
|
||||
if (mActorMngr[1].getActorP() == NULL) {
|
||||
mActorMngr[1].entry(getNearestActorP(PROC_NPC_MARO));
|
||||
mActorMngr[1].entry(getNearestActorP(fpcNm_NPC_MARO_e));
|
||||
return;
|
||||
}
|
||||
break;
|
||||
case 13:
|
||||
if (mActorMngr[0].getActorP() == NULL) {
|
||||
mActorMngr[0].entry(getNearestActorP(PROC_NPC_TARO));
|
||||
mActorMngr[0].entry(getNearestActorP(fpcNm_NPC_TARO_e));
|
||||
}
|
||||
if (mActorMngr[2].getActorP() == NULL) {
|
||||
mActorMngr[2].entry(getNearestActorP(PROC_NPC_KOLIN));
|
||||
mActorMngr[2].entry(getNearestActorP(fpcNm_NPC_KOLIN_e));
|
||||
}
|
||||
if (mActorMngr[4].getActorP() == NULL) {
|
||||
mActorMngr[4].entry(getNearestActorP(PROC_NPC_SARU));
|
||||
mActorMngr[4].entry(getNearestActorP(fpcNm_NPC_SARU_e));
|
||||
return;
|
||||
}
|
||||
break;
|
||||
case 14:
|
||||
if (mActorMngr[0].getActorP() == NULL) {
|
||||
mActorMngr[0].entry(getNearestActorP(PROC_NPC_TARO));
|
||||
mActorMngr[0].entry(getNearestActorP(fpcNm_NPC_TARO_e));
|
||||
}
|
||||
if (mActorMngr[1].getActorP() == NULL) {
|
||||
mActorMngr[1].entry(getNearestActorP(PROC_NPC_MARO));
|
||||
mActorMngr[1].entry(getNearestActorP(fpcNm_NPC_MARO_e));
|
||||
return;
|
||||
}
|
||||
break;
|
||||
case 17:
|
||||
if (mActorMngr[5].getActorP() == NULL) {
|
||||
mActorMngr[5].entry(getNearestActorP(PROC_NPC_HANJO));
|
||||
mActorMngr[5].entry(getNearestActorP(fpcNm_NPC_HANJO_e));
|
||||
}
|
||||
if (mActorMngr[6].getActorP() == NULL) {
|
||||
mActorMngr[6].entry(getNearestActorP(PROC_NPC_SEIRA));
|
||||
mActorMngr[6].entry(getNearestActorP(fpcNm_NPC_SEIRA_e));
|
||||
}
|
||||
break;
|
||||
}
|
||||
@@ -1329,9 +1329,9 @@ void daNpc_Besu_c::action() {
|
||||
}
|
||||
|
||||
void daNpc_Besu_c::beforeMove() {
|
||||
fopAcM_OffStatus(this, 0x08000000U);
|
||||
fopAcM_OffStatus(this, fopAcStts_UNK_0x8000000_e);
|
||||
if (checkHide()) {
|
||||
fopAcM_OnStatus(this, 0x08000000U);
|
||||
fopAcM_OnStatus(this, fopAcStts_UNK_0x8000000_e);
|
||||
}
|
||||
|
||||
if (checkHide() || mNoDraw) {
|
||||
@@ -3069,18 +3069,18 @@ static actor_method_class daNpc_Besu_MethodTable = {
|
||||
};
|
||||
|
||||
actor_process_profile_definition g_profile_NPC_BESU = {
|
||||
fpcLy_CURRENT_e, // mLayerID
|
||||
7, // mListID
|
||||
fpcPi_CURRENT_e, // mListPrio
|
||||
PROC_NPC_BESU, // mProcName
|
||||
&g_fpcLf_Method.base, // sub_method
|
||||
sizeof(daNpc_Besu_c), // mSize
|
||||
0, // mSizeOther
|
||||
0, // mParameters
|
||||
&g_fopAc_Method.base, // sub_method
|
||||
323, // mPriority
|
||||
&daNpc_Besu_MethodTable, // sub_method
|
||||
0x00040108, // mStatus
|
||||
fopAc_NPC_e, // mActorType
|
||||
fopAc_CULLBOX_CUSTOM_e, // cullType
|
||||
/* Layer ID */ fpcLy_CURRENT_e,
|
||||
/* List ID */ 7,
|
||||
/* List Prio */ fpcPi_CURRENT_e,
|
||||
/* Proc Name */ fpcNm_NPC_BESU_e,
|
||||
/* Proc SubMtd */ &g_fpcLf_Method.base,
|
||||
/* Size */ sizeof(daNpc_Besu_c),
|
||||
/* Size Other */ 0,
|
||||
/* Parameters */ 0,
|
||||
/* Leaf SubMtd */ &g_fopAc_Method.base,
|
||||
/* Draw Prio */ fpcDwPi_NPC_BESU_e,
|
||||
/* Actor SubMtd */ &daNpc_Besu_MethodTable,
|
||||
/* Status */ fopAcStts_UNK_0x40000_e | fopAcStts_CULL_e | fopAcStts_UNK_0x8_e,
|
||||
/* Group */ fopAc_NPC_e,
|
||||
/* Cull Type */ fopAc_CULLBOX_CUSTOM_e,
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user