etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-11-22 12:05:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed scuttlebugs incorrect behavior (#41)

Browse source 
scuttlebugs used to always target the closest mario in range, due to angleToPlayer being updated every frame, overwriting the angle if its set to the angle to the scuttlebug's home
This commit is contained in:
Isaac0-dev 2024-05-14 09:37:40 +10:00 committed by GitHub
parent 082b6dd6da
commit 626970c022
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/game/behaviors/scuttlebug.inc.c
View file

@ -39,7 +39,6 @@ void bhv_scuttlebug_loop(void) {
} }
struct Object *player = nearest_player_to_object(o); struct Object *player = nearest_player_to_object(o);
s32 angleToPlayer = player ? obj_angle_to_object(o, player) : 0;
cur_obj_update_floor_and_walls(); cur_obj_update_floor_and_walls();
if (o->oSubAction != 0 if (o->oSubAction != 0
@ -62,14 +61,14 @@ void bhv_scuttlebug_loop(void) {
case 1: case 1:
o->oForwardVel = 5.0f; o->oForwardVel = 5.0f;
if (player && cur_obj_lateral_dist_from_obj_to_home(player) > 1000.0f) { if (player && cur_obj_lateral_dist_from_obj_to_home(player) > 1000.0f) {
angleToPlayer = cur_obj_angle_to_home(); o->oAngleToMario = cur_obj_angle_to_home();
} else { } else {
if (o->oScuttlebugUnkF8 == 0) { if (o->oScuttlebugUnkF8 == 0) {
o->oScuttlebugUnkFC = 0; o->oScuttlebugUnkFC = 0;
if (player) { if (player) {
angleToPlayer = obj_angle_to_object(o, player); o->oAngleToMario = obj_angle_to_object(o, player);
} }
if (abs_angle_diff(angleToPlayer, o->oMoveAngleYaw) < 0x800) { if (abs_angle_diff(o->oAngleToMario, o->oMoveAngleYaw) < 0x800) {
o->oScuttlebugUnkF8 = 1; o->oScuttlebugUnkF8 = 1;
o->oVelY = 20.0f; o->oVelY = 20.0f;
cur_obj_play_sound_2(SOUND_OBJ2_SCUTTLEBUG_ALERT); cur_obj_play_sound_2(SOUND_OBJ2_SCUTTLEBUG_ALERT);
@ -81,17 +80,17 @@ void bhv_scuttlebug_loop(void) {
o->oScuttlebugUnkF8 = 0; o->oScuttlebugUnkF8 = 0;
} }
} }
if (update_angle_from_move_flags(&angleToPlayer)) if (update_angle_from_move_flags(&o->oAngleToMario))
o->oSubAction = 2; o->oSubAction = 2;
cur_obj_rotate_yaw_toward(angleToPlayer, 0x200); cur_obj_rotate_yaw_toward(o->oAngleToMario, 0x200);
break; break;
case 2: case 2:
o->oForwardVel = 5.0f; o->oForwardVel = 5.0f;
if ((s16) o->oMoveAngleYaw == (s16)angleToPlayer) if ((s16) o->oMoveAngleYaw == (s16)o->oAngleToMario)
o->oSubAction = 1; o->oSubAction = 1;
if (o->oPosY - o->oHomeY < -200.0f) if (o->oPosY - o->oHomeY < -200.0f)
obj_mark_for_deletion(o); obj_mark_for_deletion(o);
cur_obj_rotate_yaw_toward(angleToPlayer, 0x400); cur_obj_rotate_yaw_toward(o->oAngleToMario, 0x400);
break; break;
case 3: case 3:
o->oFlags &= ~8; o->oFlags &= ~8;