mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-05-31 17:01:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes and cleanup for d_a_npc_jagar to hit 99% matching (#2318)

Browse Source
This commit is contained in:
YunataSavior
2025-03-08 01:05:46 -08:00
committed by GitHub
parent 0c61032a8e
commit 133aaa7e02
3 changed files with 267 additions and 642 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_npc_bou.h
+39 -20
View File
@@ -35,29 +35,29 @@
/* 0x40 */ f32 field_0x40; // 0.6f
/* 0x44 */ f32 field_0x44; // 12.0f
/* 0x48 */ s16 field_0x48; // 3
/* 0x4C */ s16 field_0x4c; // 6
/* 0x50 */ s16 field_0x50; // 5
/* 0x54 */ s16 field_0x54; // 6
/* 0x58 */ f32 field_0x58; // 110.0f
/* 0x5C */ f32 field_0x5c; // 500.0f
/* 0x60 */ f32 field_0x60; // 300.0f
/* 0x64 */ f32 field_0x64; // -300.0f
/* 0x68 */ s16 field_0x68; // 60
/* 0x6C */ s16 field_0x6c; // 8
/* 0x4a */ s16 field_0x4a; // 6
/* 0x4c */ s16 field_0x4c; // 5
/* 0x4e */ s16 field_0x4e; // 6
/* 0x50 */ f32 field_0x50; // 110.0f
/* 0x54 */ f32 field_0x54; // 500.0f
/* 0x58 */ f32 field_0x58; // 300.0f
/* 0x5c */ f32 field_0x5c; // -300.0f
/* 0x60 */ s16 field_0x60; // 60
/* 0x62 */ s16 field_0x62; // 8
/* 0x64 */ f32 field_0x64; // 0.0f
/* 0x68 */ f32 field_0x68; // 0.0f
/* 0x6c */ f32 field_0x6c; // 4.0f
/* 0x70 */ f32 field_0x70; // 0.0f
/* 0x74 */ f32 field_0x74; // 0.0f
/* 0x78 */ f32 field_0x78; // 4.0f
/* 0x7C */ f32 field_0x7c; // 0.0f
/* 0x78 */ f32 field_0x78; // 0.0f
/* 0x7c */ f32 field_0x7c; // 0.0f
/* 0x80 */ f32 field_0x80; // 0.0f
/* 0x84 */ f32 field_0x84; // 0.0f
/* 0x88 */ f32 field_0x88; // 0.0f
/* 0x8C */ f32 field_0x8c; // 0.0f
/* 0x90 */ f32 field_0x90; // 0.0f
/* 0x94 */ f32 field_0x94; // 0.0f
/* 0x98 */ f32 field_0x98; // 16.0f
/* 0x9C */ f32 field_0x9c; // 1000.0f
/* 0x100 */ f32 field_0x100; // 500.0f
/* 0x104 */ f32 field_0x104; // -500.0f
/* 0x8c */ f32 field_0x8c; // 16.0f
/* 0x90 */ f32 field_0x90; // 1000.0f
/* 0x94 */ f32 field_0x94; // 500.0f
/* 0x98 */ f32 field_0x98; // -500.0f
};
static const Data m;
@@ -133,8 +133,27 @@ public:
BOOL chkFindWolf() {
int iVar1 = daNpcT_getDistTableIdx(field_0xfe0, field_0xfe4);
return daNpcT_c::chkFindWolf(mCurAngle.y, iVar1, field_0xfdc, daNpc_Bou_Param_c::m.field_0x5c,
daNpc_Bou_Param_c::m.field_0x58, daNpc_Bou_Param_c::m.field_0x60, daNpc_Bou_Param_c::m.field_0x100, 1);
return daNpcT_c::chkFindWolf(mCurAngle.y, iVar1, field_0xfdc, daNpc_Bou_Param_c::m.field_0x54,
daNpc_Bou_Param_c::m.field_0x50, daNpc_Bou_Param_c::m.field_0x58, daNpc_Bou_Param_c::m.field_0x5c, 1);
}
int chkCondition(int i_val) {
if (mStagger.checkStagger()) {
return false;
} else if (i_val != 0) {
return true;
} else {
if (mMotionSeqMngr.getNo() == 3 ||
mMotionSeqMngr.getNo() == 2 ||
mMotionSeqMngr.getNo() == 4) {
if (mMotionSeqMngr.getStepNo() > 0) {
return true;
}
} else if (mMotionSeqMngr.getNo() == 1) {
return true;
}
}
return false;
}
BOOL speakTo() {
include/d/actor/d_a_npc_jagar.h
+79 -53
View File
@@ -12,6 +12,59 @@
*
*/
class daNpc_Jagar_Param_c {
public:
/* 80A1A2C4 */ virtual ~daNpc_Jagar_Param_c() {}
struct Data {
/* 0x00 */ f32 field_0x00; // 170.0f
/* 0x04 */ f32 field_0x04; // -3.0f
/* 0x08 */ f32 field_0x08; // 1.0f
/* 0x0C */ f32 field_0x0c; // 400.0f
/* 0x10 */ f32 field_0x10; // 255.0f
/* 0x14 */ f32 field_0x14; // 160.0f
/* 0x18 */ f32 field_0x18; // 35.0f
/* 0x1C */ f32 field_0x1c; // 30.0f
/* 0x20 */ f32 field_0x20; // 0.0f
/* 0x24 */ f32 field_0x24; // 0.0f
/* 0x28 */ f32 field_0x28; // 10.0f
/* 0x2C */ f32 field_0x2c; // -10.0f
/* 0x30 */ f32 field_0x30; // 30.0f
/* 0x34 */ f32 field_0x34; // -10.0f
/* 0x38 */ f32 field_0x38; // 45.0f
/* 0x3C */ f32 field_0x3c; // -45.0f
/* 0x40 */ f32 field_0x40; // 0.6f
/* 0x44 */ f32 field_0x44; // 12.0f
/* 0x48 */ s16 field_0x48;
/* 0x4A */ s16 field_0x4a;
/* 0x4C */ s16 field_0x4c;
/* 0x4E */ s16 field_0x4e;
/* 0x50 */ f32 field_0x50; // 110.0f
/* 0x54 */ f32 field_0x54; // 500.0f
/* 0x58 */ f32 field_0x58; // 300.0f
/* 0x5C */ f32 field_0x5c; // -300.0f
/* 0x60 */ s16 field_0x60; // 60
/* 0x62 */ s16 field_0x62; // 8
/* 0x64 */ f32 field_0x64; // 0.0f
/* 0x68 */ f32 field_0x68; // 0.0f
/* 0x6C */ f32 field_0x6c; // 4.0f
/* 0x70 */ f32 field_0x70; // 0.0f
/* 0x74 */ f32 field_0x74; // 0.0f
/* 0x78 */ f32 field_0x78; // 0.0f
/* 0x7C */ f32 field_0x7c; // 0.0f
/* 0x80 */ f32 field_0x80; // 0.0f
/* 0x84 */ f32 field_0x84; // 0.0f
/* 0x88 */ f32 field_0x88; // 0.0f
/* 0x8C */ f32 field_0x8c; // 1400.0f
/* 0x90 */ f32 field_0x90; // 200.0f
/* 0x94 */ f32 field_0x94; // -800.0f
/* 0x98 */ f32 field_0x98; // 16.0f
/* 0x9C */ f32 field_0x9c; // 1800.0f
};
static const Data m;
};
class daNpc_Jagar_c : public daNpcT_c {
public:
typedef int (daNpc_Jagar_c::*cutFunc)(int);
@@ -87,6 +140,32 @@ public:
return nodeNo;
}
BOOL chkFindWolf() {
int uVar3 = (int)daNpcT_getDistTableIdx(field_0xff0, field_0xff4);
return daNpcT_c::chkFindWolf(mCurAngle.y, uVar3, field_0xfec, daNpc_Jagar_Param_c::m.field_0x54,
daNpc_Jagar_Param_c::m.field_0x50, daNpc_Jagar_Param_c::m.field_0x58,
daNpc_Jagar_Param_c::m.field_0x5c, 1);
}
int chkCondition(int i_val) {
if (mStagger.checkStagger()) {
return false;
} else if (i_val != 0) {
return true;
} else {
if (mMotionSeqMngr.getNo() == 7 ||
mMotionSeqMngr.getNo() == 6 ||
mMotionSeqMngr.getNo() == 8) {
if (mMotionSeqMngr.getStepNo() > 0) {
return true;
}
} else if (mMotionSeqMngr.getNo() == 5) {
return true;
}
}
return false;
}
u8 getPathID() { return (fopAcM_GetParam(this) & 0xff00) >> 8; }
static char* mCutNameList[7];
@@ -115,57 +194,4 @@ private:
STATIC_ASSERT(sizeof(daNpc_Jagar_c) == 0x100c);
class daNpc_Jagar_Param_c {
public:
/* 80A1A2C4 */ virtual ~daNpc_Jagar_Param_c() {}
struct Data {
/* 0x00 */ f32 field_0x00; // 170.0f
/* 0x04 */ f32 field_0x04; // -3.0f
/* 0x08 */ f32 field_0x08; // 1.0f
/* 0x0C */ f32 field_0x0c; // 400.0f
/* 0x10 */ f32 field_0x10; // 255.0f
/* 0x14 */ f32 field_0x14; // 160.0f
/* 0x18 */ f32 field_0x18; // 35.0f
/* 0x1C */ f32 field_0x1c; // 30.0f
/* 0x20 */ f32 field_0x20; // 0.0f
/* 0x24 */ f32 field_0x24; // 0.0f
/* 0x28 */ f32 field_0x28; // 10.0f
/* 0x2C */ f32 field_0x2c; // -10.0f
/* 0x30 */ f32 field_0x30; // 30.0f
/* 0x34 */ f32 field_0x34; // -10.0f
/* 0x38 */ f32 field_0x38; // 45.0f
/* 0x3C */ f32 field_0x3c; // -45.0f
/* 0x40 */ f32 field_0x40; // 0.6f
/* 0x44 */ f32 field_0x44; // 12.0f
/* 0x48 */ s16 field_0x48;
/* 0x4A */ s16 field_0x4a;
/* 0x4C */ s16 field_0x4c;
/* 0x4E */ s16 field_0x4e;
/* 0x50 */ f32 field_0x50; // 110.0f
/* 0x54 */ f32 field_0x54; // 500.0f
/* 0x58 */ f32 field_0x58; // 300.0f
/* 0x5C */ f32 field_0x5c; // -300.0f
/* 0x60 */ s16 field_0x60; // 60
/* 0x62 */ s16 field_0x62; // 8
/* 0x64 */ f32 field_0x64; // 0.0f
/* 0x68 */ f32 field_0x68; // 0.0f
/* 0x6C */ f32 field_0x6c; // 4.0f
/* 0x70 */ f32 field_0x70; // 0.0f
/* 0x74 */ f32 field_0x74; // 0.0f
/* 0x78 */ f32 field_0x78; // 0.0f
/* 0x7C */ f32 field_0x7c; // 0.0f
/* 0x80 */ f32 field_0x80; // 0.0f
/* 0x84 */ f32 field_0x84; // 0.0f
/* 0x88 */ f32 field_0x88; // 0.0f
/* 0x8C */ f32 field_0x8c; // 1400.0f
/* 0x90 */ f32 field_0x90; // 200.0f
/* 0x94 */ f32 field_0x94; // -800.0f
/* 0x98 */ f32 field_0x98; // 16.0f
/* 0x9C */ f32 field_0x9c; // 1800.0f
};
static const Data m;
};
#endif /* D_A_NPC_JAGAR_H */