Hri7566
/
sm64coopdx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Synchronized unagi

This commit is contained in:
MysterD 2020-08-18 18:47:06 -07:00
parent 57a4e746cf
commit 53576aa51e
1 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/game/behaviors/unagi.inc.c
View File

@ -29,10 +29,30 @@ void bhv_unagi_init(void) {
} }
o->oPathedPrevWaypoint = o->oPathedStartWaypoint; o->oPathedPrevWaypoint = o->oPathedStartWaypoint;
network_init_object(o, 4000.0f);
network_init_object_field(o, &o->oFaceAnglePitch);
network_init_object_field(o, &o->oFaceAngleRoll);
network_init_object_field(o, &o->oFaceAngleYaw);
network_init_object_field(o, &o->oForwardVel);
network_init_object_field(o, &o->oMoveAnglePitch);
network_init_object_field(o, &o->oPathedPrevWaypoint);
network_init_object_field(o, &o->oPathedPrevWaypointFlags);
network_init_object_field(o, &o->oPathedTargetPitch);
network_init_object_field(o, &o->oPathedTargetYaw);
network_init_object_field(o, &o->oSoundStateID);
network_init_object_field(o, &o->oUnagiUnk110);
network_init_object_field(o, &o->oUnagiUnk1AC);
network_init_object_field(o, &o->oUnagiUnkF4);
network_init_object_field(o, &o->oUnagiUnkF8);
network_init_object_field(o, &o->oVelX);
network_init_object_field(o, &o->oVelZ);
} }
void unagi_act_0(void) { void unagi_act_0(void) {
if (o->oDistanceToMario > 4500.0f && o->oSubAction != 0) { struct Object* player = nearest_player_to_object(o);
int distanceToPlayer = dist_between_objects(o, player);
if (distanceToPlayer > 4500.0f && o->oSubAction != 0) {
o->oAction = 1; o->oAction = 1;
o->oPosX = o->oPathedStartWaypoint->pos[0]; o->oPosX = o->oPathedStartWaypoint->pos[0];
o->oPosY = o->oPathedStartWaypoint->pos[1]; o->oPosY = o->oPathedStartWaypoint->pos[1];
@ -142,15 +162,18 @@ void unagi_act_3(void) {
void bhv_unagi_loop(void) { void bhv_unagi_loop(void) {
s32 val04; s32 val04;
struct Object* player = nearest_player_to_object(o);
int distanceToPlayer = dist_between_objects(o, player);
if (o->oUnagiUnk1B2 == 0) { if (o->oUnagiUnk1B2 == 0) {
o->oUnagiUnk1AC = 99999.0f; o->oUnagiUnk1AC = 99999.0f;
if (o->oDistanceToMario < 3000.0f) { if (distanceToPlayer < 3000.0f) {
for (val04 = -4; val04 < 4; val04++) { for (val04 = -4; val04 < 4; val04++) {
spawn_object_relative(val04, 0, 0, 0, o, MODEL_NONE, bhvUnagiSubobject); spawn_object_relative(val04, 0, 0, 0, o, MODEL_NONE, bhvUnagiSubobject);
} }
o->oUnagiUnk1B2 = 1; o->oUnagiUnk1B2 = 1;
} }
} else if (o->oDistanceToMario > 4000.0f) { } else if (distanceToPlayer > 4000.0f) {
o->oUnagiUnk1B2 = 0; o->oUnagiUnk1B2 = 0;
} }
@ -175,6 +198,9 @@ void bhv_unagi_loop(void) {
void bhv_unagi_subobject_loop(void) { void bhv_unagi_subobject_loop(void) {
f32 val04; f32 val04;
struct Object* player = nearest_player_to_object(o);
int distanceToPlayer = dist_between_objects(o, player);
if (o->parentObj->oUnagiUnk1B2 == 0) { if (o->parentObj->oUnagiUnk1B2 == 0) {
obj_mark_for_deletion(o); obj_mark_for_deletion(o);
} else { } else {
@ -188,7 +214,7 @@ void bhv_unagi_subobject_loop(void) {
o->oPosZ = o->parentObj->oPosZ + val04 * coss(o->parentObj->oFaceAngleYaw); o->oPosZ = o->parentObj->oPosZ + val04 * coss(o->parentObj->oFaceAngleYaw);
if (o->oBehParams2ndByte == -4) { if (o->oBehParams2ndByte == -4) {
if (o->parentObj->oAnimState != 0 && o->oDistanceToMario < 150.0f) { if (o->parentObj->oAnimState != 0 && distanceToPlayer < 150.0f) {
o->oBehParams = o->parentObj->oBehParams; o->oBehParams = o->parentObj->oBehParams;
spawn_default_star(6833.0f, -3654.0f, 2230.0f); spawn_default_star(6833.0f, -3654.0f, 2230.0f);
o->parentObj->oAnimState = 0; o->parentObj->oAnimState = 0;
@ -196,7 +222,7 @@ void bhv_unagi_subobject_loop(void) {
} else { } else {
obj_check_attacks(&sUnagiHitbox, o->oAction); obj_check_attacks(&sUnagiHitbox, o->oAction);
if (o->oBehParams2ndByte == 3) { if (o->oBehParams2ndByte == 3) {
o->parentObj->oUnagiUnk1AC = o->oDistanceToMario; o->parentObj->oUnagiUnk1AC = distanceToPlayer;
} }
} }
} }