Hri7566
/
sm64ex-coop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Synchronized Dorrie

This commit is contained in:
MysterD 2020-10-01 21:27:19 -07:00
parent 4240603d86
commit b19178bbdd
5 changed files with 94 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
src/game/behaviors/dorrie.inc.c
View File

@ -1,3 +1,8 @@
static u8 dorrieLiftingPlayer[MAX_PLAYERS] = { 0 };
static u8 bhv_dorrie_ignore_if_true(void) {
return (o->oAction == DORRIE_ACT_RAISE_HEAD) && (gMarioStates[0].marioObj->platform == o || dorrieLiftingPlayer[0]);
}
void dorrie_raise_head(void) {
s16 startAngle;
@ -11,8 +16,15 @@ void dorrie_raise_head(void) {
xzDisp = 440.0f * (coss(o->oDorrieNeckAngle) - coss(startAngle));
yDisp = 440.0f * (sins(o->oDorrieNeckAngle) - sins(startAngle));
set_mario_pos(gMarioObject->oPosX + xzDisp * sins(o->oMoveAngleYaw), gMarioObject->oPosY - yDisp,
gMarioObject->oPosZ + xzDisp * coss(o->oMoveAngleYaw));
for (int i = 0; i < MAX_PLAYERS; i++) {
if (!is_player_active(&gMarioStates[i])) { continue; }
if (!dorrieLiftingPlayer[i]) { continue; }
struct Object* player = gMarioStates[i].marioObj;
set_mario_pos(&gMarioStates[i],
player->oPosX + xzDisp * sins(o->oMoveAngleYaw),
player->oPosY - yDisp,
player->oPosZ + xzDisp * coss(o->oMoveAngleYaw));
}
}
void dorrie_act_move(void) {
@ -32,10 +44,21 @@ void dorrie_act_move(void) {
o->oForwardVel = 0.0f;
o->oDorrieYawVel = 0;
} else {
if (gMarioObject->platform == o) {
targetYaw = gMarioObject->oFaceAngleYaw;
u8 anyPlayerOnPlatform = FALSE;
for (int i = 0; i < MAX_PLAYERS; i++) {
if (!is_player_active(&gMarioStates[i])) { continue; }
struct Object* player = gMarioStates[i].marioObj;
if (player->platform != o) { continue; }
targetYaw = player->oFaceAngleYaw;
targetSpeed = 10;
} else {
anyPlayerOnPlatform = TRUE;
break;
}
if (!anyPlayerOnPlatform) {
circularTurn = 0x4000 - atan2s(2000.0f, o->oDorrieDistToHome - 2000.0f);
if ((s16)(o->oMoveAngleYaw - o->oDorrieAngleToHome) < 0) {
circularTurn = -circularTurn;
@ -65,6 +88,8 @@ static u8 dorrie_act_lower_head_continue_dialog(void) {
}
void dorrie_act_lower_head(void) {
int distanceToLocalPlayer = dist_between_objects(o, gMarioStates[0].marioObj);
if (cur_obj_init_anim_check_frame(2, 35)) {
cur_obj_reverse_animation();
@ -79,10 +104,12 @@ void dorrie_act_lower_head(void) {
}
}
#else
if (gMarioObject->platform == o) {
if (o->oDorrieOffsetY == -17.0f && o->oDorrieForwardDistToMario > 780.0f
if (cur_obj_is_any_player_on_platform()) {
if (gMarioStates[0].marioObj->platform == o
&& o->oDorrieOffsetY == -17.0f && distanceToLocalPlayer > 780.0f
&& set_mario_npc_dialog(&gMarioStates[0], 2, dorrie_act_lower_head_continue_dialog) == 1) {
dorrie_begin_head_raise(TRUE);
network_send_object(o);
} else if (o->oDorrieForwardDistToMario > 320.0f) {
o->oTimer = 0;
}
@ -101,30 +128,62 @@ static u8 dorrie_act_raise_head_continue_dialog(void) {
}
void dorrie_act_raise_head(void) {
struct MarioState* marioState = nearest_mario_state_to_object(o);
o->collisionData = segmented_to_virtual(dorrie_seg6_collision_0600F644);
if (cur_obj_check_if_near_animation_end()) {
o->oAction = DORRIE_ACT_MOVE;
for (int i = 0; i < MAX_PLAYERS; i++) { dorrieLiftingPlayer[i] = FALSE; }
} else if (o->oDorrieLiftingMario && o->header.gfx.unk38.animFrame < 74) {
if (set_mario_npc_dialog(&gMarioStates[0], 2, dorrie_act_raise_head_continue_dialog) == 2) {
for (int i = 0; i < MAX_PLAYERS; i++) {
if (!is_player_active(&gMarioStates[i])) { continue; }
if (gMarioStates[i].marioObj->platform != o) { continue; }
int dist = dist_between_objects(o, gMarioStates[0].marioObj);
if (dist <= 780.0f) { continue; }
dorrieLiftingPlayer[i] = TRUE;
}
if (dorrieLiftingPlayer[0]) {
set_mario_npc_dialog(&gMarioStates[0], 2, dorrie_act_raise_head_continue_dialog);
}
//if (set_mario_npc_dialog(&gMarioStates[0], 2, dorrie_act_raise_head_continue_dialog) == 2) {
o->oDorrieHeadRaiseSpeed += 0x1CC;
if (cur_obj_check_anim_frame(73)) {
if (cur_obj_check_anim_frame(73) && dorrieLiftingPlayer[0]) {
set_mario_npc_dialog(&gMarioStates[0], 0, NULL);
}
dorrie_raise_head();
} else {
/*} else {
cur_obj_reverse_animation();
}
}*/
}
}
void bhv_dorrie_update(void) {
struct Object* player = nearest_player_to_object(o);
int distanceToPlayer = dist_between_objects(o, player);
int angleToPlayer = obj_angle_to_object(o, player);
if (!network_sync_object_initialized(o)) {
for (int i = 0; i < MAX_PLAYERS; i++) { dorrieLiftingPlayer[i] = FALSE; }
struct SyncObject* so = network_init_object(o, 4000.0f);
so->ignore_if_true = bhv_dorrie_ignore_if_true;
network_init_object_field(o, &o->oDorrieOffsetY);
network_init_object_field(o, &o->oDorrieVelY);
network_init_object_field(o, &o->oDorrieYawVel);
network_init_object_field(o, &o->oDorrieLiftingMario);
network_init_object_field(o, &o->oDorrieNeckAngle);
network_init_object_field(o, &o->oAngleVelYaw);
}
f32 boundsShift;
UNUSED s32 unused1;
UNUSED s32 unused2;
f32 maxOffsetY;
if (!(o->activeFlags & ACTIVE_FLAG_IN_DIFFERENT_ROOM)) {
o->oDorrieForwardDistToMario = o->oDistanceToMario * coss(o->oAngleToMario - o->oMoveAngleYaw);
o->oDorrieForwardDistToMario = distanceToPlayer * coss(angleToPlayer - o->oMoveAngleYaw);
obj_perform_position_op(0);
cur_obj_move_using_fvel_and_gravity();
@ -133,8 +192,7 @@ void bhv_dorrie_update(void) {
o->oDorrieDistToHome = cur_obj_lateral_dist_to_home();
// Shift dorrie's bounds to account for her neck
boundsShift =
440.0f * coss(o->oDorrieNeckAngle) * coss(o->oMoveAngleYaw - o->oDorrieAngleToHome);
boundsShift = 440.0f * coss(o->oDorrieNeckAngle) * coss(o->oMoveAngleYaw - o->oDorrieAngleToHome);
if (clamp_f32(&o->oDorrieDistToHome, 1650.0f + boundsShift, 2300.0f + boundsShift)) {
o->oPosX = o->oHomeX - o->oDorrieDistToHome * sins(o->oDorrieAngleToHome);
@ -143,7 +201,7 @@ void bhv_dorrie_update(void) {
o->oDorrieGroundPounded = cur_obj_is_mario_ground_pounding_platform();
if (gMarioObject->platform == o) {
if (cur_obj_is_any_player_on_platform()) {
maxOffsetY = -17.0f;
if (o->oDorrieOffsetY >= 0.0f) {
if (o->oDorrieGroundPounded) {

4
src/game/behaviors/tilting_inverted_pyramid.inc.c
View File

@ -99,7 +99,7 @@ void bhv_tilting_inverted_pyramid_loop(void) {
x /= (f32)playersTouched;
y /= (f32)playersTouched;
z /= (f32)playersTouched;
get_mario_pos(&mx, &my, &mz);
get_mario_pos(&gMarioStates[0], &mx, &my, &mz);
dist[0] = x - o->oPosX;
dist[1] = y - o->oPosY;
@ -148,7 +148,7 @@ void bhv_tilting_inverted_pyramid_loop(void) {
mx += posAfterRotation[0] - posBeforeRotation[0];
my += posAfterRotation[1] - posBeforeRotation[1];
mz += posAfterRotation[2] - posBeforeRotation[2];
set_mario_pos(mx, my, mz);
set_mario_pos(&gMarioStates[0], mx, my, mz);
}
o->header.gfx.throwMatrix = transform;

16
src/game/platform_displacement.c
View File

@ -73,19 +73,19 @@ void update_mario_platform(void) {
/**
* Get Mario's position and store it in x, y, and z.
*/
void get_mario_pos(f32 *x, f32 *y, f32 *z) {
*x = gMarioStates[0].pos[0];
*y = gMarioStates[0].pos[1];
*z = gMarioStates[0].pos[2];
void get_mario_pos(struct MarioState* m, f32 *x, f32 *y, f32 *z) {
*x = m->pos[0];
*y = m->pos[1];
*z = m->pos[2];
}
/**
* Set Mario's position.
*/
void set_mario_pos(f32 x, f32 y, f32 z) {
gMarioStates[0].pos[0] = x;
gMarioStates[0].pos[1] = y;
gMarioStates[0].pos[2] = z;
void set_mario_pos(struct MarioState* m, f32 x, f32 y, f32 z) {
m->pos[0] = x;
m->pos[1] = y;
m->pos[2] = z;
}
/**

4
src/game/platform_displacement.h
View File

@ -6,8 +6,8 @@
#include "types.h"
void update_mario_platform(void);
void get_mario_pos(f32 *x, f32 *y, f32 *z);
void set_mario_pos(f32 x, f32 y, f32 z);
void get_mario_pos(struct MarioState* m, f32 *x, f32 *y, f32 *z);
void set_mario_pos(struct MarioState* m, f32 x, f32 y, f32 z);
void apply_platform_displacement(u32 playerIndex, struct Object *platform);
void apply_mario_platform_displacement(void);
#ifndef VERSION_JP

11
src/pc/controller/controller_keyboard_debug.c
View File

@ -7,7 +7,7 @@
#ifdef DEBUG
static u8 warpToLevel = LEVEL_SSL;
static u8 warpToLevel = LEVEL_HMC;
#define SCANCODE_0 0x0B
#define SCANCODE_1 0x02
@ -104,6 +104,13 @@ static void debug_grand_star(void) {
set_mario_action(&gMarioStates[0], ACT_JUMBO_STAR_CUTSCENE, 0);
}
static void debug_warp_to(void) {
gMarioStates[0].pos[0] = gMarioStates[1].pos[0];
gMarioStates[0].pos[1] = gMarioStates[1].pos[1];
gMarioStates[0].pos[2] = gMarioStates[1].pos[2];
gMarioStates[0].marioObj->oRoom = gMarioStates[1].marioObj->oRoom;
}
static void debug_suicide(void) {
gMarioStates[0].hurtCounter = 31;
}
@ -115,7 +122,7 @@ void debug_keyboard_on_key_down(int scancode) {
#ifdef DEVELOPMENT
case SCANCODE_6: debug_warp_level(warpToLevel); break;
case SCANCODE_7: debug_warp_area(); break;
case SCANCODE_9: debug_grand_star(); break;
case SCANCODE_9: debug_warp_to(); break;
case SCANCODE_0: debug_suicide(); break;
#endif
}