Skip to content

Dutchman anim and kingjelly cleanup #457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattbruv merged 9 commits into from
Mar 20, 2025
Merged

Dutchman anim and kingjelly cleanup #457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f50bd48
self setup and others
LivewireCB Mar 18, 2025
6889b80
Merge branch 'main' into dev
LivewireCB Mar 18, 2025
935bf49
zNPC_AnimTable_KingJelly
LivewireCB Mar 19, 2025
ed0e484
fix
LivewireCB Mar 19, 2025
7c83718
removed leftover junk from intially starting the function
LivewireCB Mar 19, 2025
aa52c8a
Merge branch 'main' into dev
LivewireCB Mar 19, 2025
8ef3111
ZNPC_AnimTable_BossSB2 - 73% code match
LivewireCB Mar 20, 2025
2b0e9a9
Merge branch 'main' into dev
LivewireCB Mar 20, 2025
58b715b
Dutchman anim table should be complete, removed some junk from zNPCTy…
LivewireCB Mar 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 95 additions & 2 deletions src/SB/Game/zNPCTypeDutchman.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,101 @@ namespace
{
}
} // namespace
//dummy text for pushing

#define f1605 0.0f
#define f1606 1.0f
#define f1689 0.2f
#define f1690 0.1f

#define ANIM_Idle01 1
#define ANIM_Fidget01 4 //0x10
#define ANIM_Fidget02 5 //0x14
#define ANIM_Fidget03 6 //0x18
#define ANIM_Taunt01 7 // 0x1c
#define ANIM_Death01 11 //0x2c
#define ANIM_AttackWindup01 12 //0x30
#define ANIM_AttackLoop01 13 //0x34
#define ANIM_AttackEnd01 14 //0x38
#define ANIM_Attack02Windup01 16 //0x40
#define ANIM_Attack02Loop01 17 //0x44
#define ANIM_Attack02End01 18 //0x48
#define ANIM_LassoGrab01 19 //0x4c

//13 new states
//8 new transitions
xAnimTable* ZNPC_AnimTable_Dutchman()
{
// clang-format off
S32 ourAnims[13] = {
ANIM_Idle01,
ANIM_Fidget01,
ANIM_Fidget02,
ANIM_Fidget03,
ANIM_Taunt01,
ANIM_Death01,
ANIM_AttackWindup01,
ANIM_AttackLoop01,
ANIM_AttackEnd01,
ANIM_Attack02Windup01,
ANIM_Attack02Loop01,
ANIM_Attack02End01,
ANIM_LassoGrab01,

};
// clang-format on
xAnimTable* table = xAnimTableNew("zNPCDutchman", NULL, 0);

xAnimTableNewState(table, g_strz_subbanim[ANIM_Idle01], 0x10, 0, f1606, NULL, NULL, f1605, NULL,
NULL, xAnimDefaultBeforeEnter, NULL, NULL);
xAnimTableNewState(table, g_strz_subbanim[ANIM_Death01], 0, 0, f1606, NULL, NULL, f1605, NULL,
NULL, xAnimDefaultBeforeEnter, NULL, NULL);
xAnimTableNewState(table, g_strz_subbanim[ANIM_Fidget01], 0x20, 0, f1606, NULL, NULL, f1605,
NULL, NULL, xAnimDefaultBeforeEnter, NULL, NULL);
xAnimTableNewState(table, g_strz_subbanim[ANIM_Fidget02], 0x20, 0, f1606, NULL, NULL, f1605,
NULL, NULL, xAnimDefaultBeforeEnter, NULL, NULL);
xAnimTableNewState(table, g_strz_subbanim[ANIM_Fidget03], 0x20, 0, f1606, NULL, NULL, f1605,
NULL, NULL, xAnimDefaultBeforeEnter, NULL, NULL);
xAnimTableNewState(table, g_strz_subbanim[ANIM_Taunt01], 0x20, 0, f1606, NULL, NULL, f1605,
NULL, NULL, xAnimDefaultBeforeEnter, NULL, NULL);
xAnimTableNewState(table, g_strz_subbanim[ANIM_AttackWindup01], 0x20, 0, f1606, NULL, NULL,
f1605, NULL, NULL, xAnimDefaultBeforeEnter, NULL, NULL);
xAnimTableNewState(table, g_strz_subbanim[ANIM_AttackLoop01], 0x10, 0, f1606, NULL, NULL, f1605,
NULL, NULL, xAnimDefaultBeforeEnter, NULL, NULL);
xAnimTableNewState(table, g_strz_subbanim[ANIM_AttackEnd01], 0x20, 0, f1606, NULL, NULL, f1605,
NULL, NULL, xAnimDefaultBeforeEnter, NULL, NULL);
xAnimTableNewState(table, g_strz_subbanim[ANIM_Attack02Windup01], 0x20, 0, f1606, NULL, NULL,
f1605, NULL, NULL, xAnimDefaultBeforeEnter, NULL, NULL);
xAnimTableNewState(table, g_strz_subbanim[ANIM_Attack02Loop01], 0x10, 0, f1606, NULL, NULL,
f1605, NULL, NULL, xAnimDefaultBeforeEnter, NULL, NULL);
xAnimTableNewState(table, g_strz_subbanim[ANIM_Attack02End01], 0x20, 0, f1606, NULL, NULL,
f1605, NULL, NULL, xAnimDefaultBeforeEnter, NULL, NULL);
xAnimTableNewState(table, g_strz_subbanim[ANIM_LassoGrab01], 0x20, 0x2000000, f1606, NULL, NULL,
f1605, NULL, NULL, xAnimDefaultBeforeEnter, NULL, NULL);

NPCC_BuildStandardAnimTran(table, g_strz_subbanim, ourAnims, 1, f1689);

xAnimTableNewTransition(table, g_strz_subbanim[ANIM_AttackWindup01],
g_strz_subbanim[ANIM_AttackLoop01], 0, 0, 0x10, 0, 0, 0, 0, 0, f1690,
0);
xAnimTableNewTransition(table, g_strz_subbanim[ANIM_AttackLoop01],
g_strz_subbanim[ANIM_AttackEnd01], 0, 0, 0, 0, 0, 0, 0, 0, f1690, 0);
xAnimTableNewTransition(table, g_strz_subbanim[ANIM_Attack02Windup01],
g_strz_subbanim[ANIM_Attack02Loop01], 0, 0, 0x10, 0, 0, 0, 0, 0, f1690,
0);
xAnimTableNewTransition(table, g_strz_subbanim[ANIM_Attack02Loop01],
g_strz_subbanim[ANIM_Attack02End01], 0, 0, 0, 0, 0, 0, 0, 0, f1690, 0);
xAnimTableNewTransition(table, g_strz_subbanim[ANIM_Fidget02], g_strz_subbanim[ANIM_Idle01], 0,
0, 0x10, 0, 0, 0, 0, 0, f1690, 0);
xAnimTableNewTransition(table, g_strz_subbanim[ANIM_Fidget02],
g_strz_subbanim[ANIM_AttackWindup01], 0, 0, 0, 0, 0, 0, 0, 0, f1690, 0);
xAnimTableNewTransition(table, g_strz_subbanim[ANIM_Fidget02], g_strz_subbanim[ANIM_Fidget01],
0, 0, 0, 0, 0, 0, 0, 0, f1690, 0);
xAnimTableNewTransition(table, g_strz_subbanim[ANIM_LassoGrab01], g_strz_subbanim[ANIM_Death01],
0, 0, 0, 0, 0, 0, 0, 0, f1690, 0);

return table;
}

void xMat3x3RMulVec(xVec3* o, const xMat3x3* m, const xVec3* v)
{
F32 x = m->right.x * v->x + m->up.x * v->y + m->at.x * v->z;
Expand Down Expand Up @@ -216,7 +310,6 @@ S32 zNPCGoalDutchmanDeath::Enter(F32 dt, void* updCtxt)
{
owner.delay = 0.0f;
return zNPCGoalCommon::Enter(dt, updCtxt);

}

U8 zNPCDutchman::PhysicsFlags() const
Expand Down
16 changes: 2 additions & 14 deletions src/SB/Game/zNPCTypeKingJelly.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#define ANIM_Fidget02 5
#define ANIM_Fidget03 6
#define ANIM_Taunt01 7 // 0x1c
#define ANIM_Attack01 8 //0x20 DEPRACATED
#define ANIM_Attack01 8 //0x20
#define ANIM_Damage01 9 //0x24
#define ANIM_Damage02 10 //0x28
#define ANIM_Death01 11 //0x2c
Expand All @@ -29,18 +29,6 @@
#define ANIM_Attack02End01 18
#define ANIM_LassoGrab01 19

// #define ANIM_Idle01 1
// #define ANIM_Idle02 2
// #define ANIM_Idle03 3
// #define ANIM_Taunt01 7
// #define ANIM_Attack01 8
// #define ANIM_AttackWindup01 12
// #define ANIM_AttackLoop01 13
// #define ANIM_AttackEnd01 14
// #define ANIM_Damage01 9
// #define ANIM_SpawnKids01 15
// #define ANIM_Unknown 0

namespace
{
void tweak()
Expand All @@ -66,7 +54,7 @@ xAnimTable* ZNPC_AnimTable_KingJelly()
ANIM_Idle03,
ANIM_Taunt01,
ANIM_Attack01,
ANIM_AttackWindup01, // replace with king jelly anims
ANIM_AttackWindup01,
ANIM_AttackLoop01,
ANIM_AttackEnd01,
ANIM_Damage01,
Expand Down