Skip to content

Robo-Sandy Callback Funcs and Idle Goal Impl #521

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 4 commits into from
Apr 18, 2025
Merged

Robo-Sandy Callback Funcs and Idle Goal Impl #521

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f3de60c
zNPCTypeBossSandy: Add SandyLimbSpring struct from DWARF data
JoshSanch Apr 12, 2025
c39a779
zNPCTypeBossSandy: sit, getUp, runToRope, clothesline callbacks
JoshSanch Apr 18, 2025
a038275
zNPCTypeBossSandy: zNPCGoalBossSandyIdle virtual implementations
JoshSanch Apr 18, 2025
d055074
Fix: Remove redef of SandyLimbSpring bc rebasing is hard
JoshSanch Apr 18, 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
199 changes: 193 additions & 6 deletions src/SB/Game/zNPCTypeBossSandy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include "xMarkerAsset.h"
#include "zCamera.h"
#include "zGrid.h"
#include "zAssetTypes.h"

extern const char bossSandyStrings[];

Expand Down Expand Up @@ -966,20 +967,206 @@ static S32 leapCB(xGoal* rawgoal, void*, en_trantype* trantype, F32 dt, void*)
return nextgoal;
}

static S32 sitCB(xGoal* rawgoal, void*, en_trantype* trantype, F32 dt, void*);
static S32 getUpCB(xGoal* rawgoal, void*, en_trantype* trantype, F32 dt, void*);
static S32 runToRopeCB(xGoal* rawgoal, void*, en_trantype* trantype, F32 dt, void*);
static S32 clotheslineCB(xGoal* rawgoal, void*, en_trantype* trantype, F32 dt, void*);
static S32 sitCB(xGoal* rawgoal, void*, en_trantype* trantype, F32 dt, void*)
{
zNPCGoalBossSandySit* sit = (zNPCGoalBossSandySit*)rawgoal;
zNPCBSandy* sandy = (zNPCBSandy*)sit->psyche->clt_owner;
S32 nextgoal = 0;

if (sandy->round == 3 && sHeadPopOffFactor > 0.0f)
{
xSndPlay3D(xStrHash("B101_SC_headoff1"), 2.31f, 0.0f, 0x0, 0x0, sandy, 30.0f, SND_CAT_GAME,
0.0f);
*trantype = GOAL_TRAN_SET;
nextgoal = 'NGB5';
}
else if (sit->sitFlags & 0x1)
{
if (sit->timeInGoal > sit->totalTime)
{
if (sandy->round == 1)
{
nextgoal = 'NGB9';
*trantype = GOAL_TRAN_SET;
}
else
{
nextgoal = 'NGB5';
*trantype = GOAL_TRAN_SET;
}
}
}
else if (sit->timeInGoal > 5.0f)
{
nextgoal = 'NGB9';
*trantype = GOAL_TRAN_SET;
}

return nextgoal;
}

static S32 getUpCB(xGoal* rawgoal, void*, en_trantype* trantype, F32 dt, void*)
{
zNPCGoalBossSandyRunToRope* runGoal = (zNPCGoalBossSandyRunToRope*)rawgoal;
zNPCBSandy* sandy = (zNPCBSandy*)runGoal->psyche->clt_owner;
S32 nextgoal = 0;
xVec3 pcFuturePos;
F32 futureDist;

xVec3Sub(&pcFuturePos, (xVec3*)&globals.player.ent.model->Mat->pos,
(xVec3*)&sandy->model->Mat->pos);

pcFuturePos.y = 0.0f;
futureDist = xVec3Length2(&pcFuturePos);

if (sandy->AnimTimeRemain(NULL) < 1.7f * dt)
{
if ((sandy->round == 1 && !(sandy->hitPoints > 6)) ||
(sandy->round == 2 && !(sandy->hitPoints > 3)) ||
(sandy->round == 3 && !(sandy->hitPoints > 0)) || (globals.player.ControlOff))
{
nextgoal = 'NGB1';
*trantype = GOAL_TRAN_SET;
}
else if (sandy->bossFlags & 0x2)
{
sandy->bossFlags &= ~0x2;
nextgoal = 'NGB2';
*trantype = GOAL_TRAN_SET;
}
else if (futureDist < 12.0f)
{
nextgoal = 'NGB4';
*trantype = GOAL_TRAN_SET;
}
else
{
nextgoal = 'NGB3';
*trantype = GOAL_TRAN_SET;
}
}

return nextgoal;
}

static S32 runToRopeCB(xGoal* rawgoal, void*, en_trantype* trantype, F32 dt, void*)
{
zNPCGoalBossSandyRunToRope* runGoal = (zNPCGoalBossSandyRunToRope*)rawgoal;
zNPCBSandy* sandy = (zNPCBSandy*)runGoal->psyche->clt_owner;
S32 nextgoal = 0;
F32 projection;
xVec3 newPos;

xVec3Sub(&newPos, &sandy->bouncePoint[sandy->fromRope], (xVec3*)&sandy->model->Mat->pos);

newPos.y = 0.0f;
projection = xVec3Dot(&newPos, &sandy->ropeNormal[sandy->fromRope]);

if (globals.player.ControlOff != FALSE)
{
nextgoal = 'NGB1';
*trantype = GOAL_TRAN_SET;
}
else if (projection > 0.0f)
{
nextgoal = 'NGB;';
*trantype = GOAL_TRAN_SET;
sandy->boundFlags[10] &= ~0x10;
sandy->boundFlags[12] &= ~0x10;
}

return nextgoal;
}

static S32 clotheslineCB(xGoal* rawgoal, void*, en_trantype* trantype, F32 dt, void*)
{
zNPCGoalBossSandyClothesline* cl = (zNPCGoalBossSandyClothesline*)rawgoal;
zNPCBSandy* sandy = (zNPCBSandy*)cl->psyche->clt_owner;
S32 nextgoal = 0;

if (cl->stage == 2 && sandy->AnimTimeRemain(NULL) < 1.7f * dt)
{
sandy->boundFlags[10] &= ~0x10;
sandy->boundFlags[12] &= ~0x10;

if (globals.player.ControlOff)
{
nextgoal = 'NGB1';
*trantype = GOAL_TRAN_SET;
}
else if (sandy->bossFlags & 0x2)
{
sandy->bossFlags &= ~0x2;
nextgoal = 'NGB2';
*trantype = GOAL_TRAN_SET;
}
else
{
nextgoal = 'NGB3';
*trantype = GOAL_TRAN_SET;
}
}

return nextgoal;
}

S32 zNPCGoalBossSandyIdle::Enter(F32 dt, void* updCtxt)
{
zNPCBSandy* sandy;
zNPCBSandy* sandy = (zNPCBSandy*)psyche->clt_owner;

timeInGoal = 0.0f;
sandy->bossFlags |= 0x20;

// xVec3Init();
xVec3Init(&sandy->frame->vel, 0.0f, 0.0f, 0.0f);

sandy->boundFlags[10] |= 0x10;
sandy->boundFlags[12] |= 0x10;

return zNPCGoalCommon::Enter(dt, updCtxt);
}

S32 zNPCGoalBossSandyIdle::Process(en_trantype* trantype, F32 dt, void* updCtxt, xScene* xscn)
{
zNPCBSandy* sandy = (zNPCBSandy*)psyche->clt_owner;

timeInGoal += dt;

xVec3 newAt;
xVec3Sub(&newAt, (xVec3*)&globals.player.ent.model->Mat->pos, (xVec3*)&sandy->model->Mat->pos);

newAt.y = 0.0f;

xVec3Normalize(&newAt, &newAt);
xVec3SMul((xVec3*)&sandy->frame->mat.at, (xVec3*)&sandy->model->Mat->at, 0.98f);

xVec3AddScaled((xVec3*)&sandy->frame->mat.at, &newAt, 0.02f);

sandy->frame->mat.at.y = 0.0f;
xVec3Normalize(&sandy->frame->mat.at, &sandy->frame->mat.at);
xVec3Cross(&sandy->frame->mat.right, &sandy->frame->mat.up, &sandy->frame->mat.at);

sandy->frame->mat.pos.y = 0.0f;
xVec3Dot(&newAt, (xVec3*)&sandy->model->Mat->right);

F32 lerp = 1.0f;
lerp -= 0.02f;
sandy->model->Anim->Single->BilinearLerp[0] = lerp;
sandy->model->Anim->Single->Blend->BilinearLerp[0] = lerp;

return xGoal::Process(trantype, dt, updCtxt, xscn);
}

S32 zNPCGoalBossSandyIdle::Exit(F32 dt, void* updCtxt)
{
zNPCBSandy* sandy = (zNPCBSandy*)psyche->clt_owner;

sandy->bossFlags &= ~0x20;
sandy->boundFlags[10] &= ~0x10;
sandy->boundFlags[12] &= ~0x10;

return xGoal::Exit(dt, updCtxt);
}

void xBinaryCamera::add_tweaks(char const*)
{
}
Expand Down