mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-07-08 21:34:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Target -> Attention (System Rename) Part 2 (#1721)

Browse Source 
* remaining attention rename

* cleanup
This commit is contained in:
engineer124
2024-10-21 01:05:53 +11:00
committed by GitHub
parent 1b7c9ecb88
commit 781d1d1119
301 changed files with 1085 additions and 1057 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/z_actor.c
+29 -28
View File
@@ -710,7 +710,7 @@ void Attention_Update(Attention* attention, Player* player, Actor* playerFocusAc
attention->reticleFadeAlphaControl = 0;
}
sfxId = CHECK_FLAG_ALL(playerFocusActor->flags, ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_HOSTILE)
sfxId = CHECK_FLAG_ALL(playerFocusActor->flags, ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE)
? NA_SE_SY_LOCK_ON
: NA_SE_SY_LOCK_ON_HUMAN;
Audio_PlaySfx(sfxId);
@@ -1083,7 +1083,7 @@ void* Actor_FindSharedMemoryEntry(PlayState* play, s16 id) {
void Actor_Kill(Actor* actor) {
actor->draw = NULL;
actor->update = NULL;
actor->flags &= ~ACTOR_FLAG_TARGETABLE;
actor->flags &= ~ACTOR_FLAG_ATTENTION_ENABLED;
}
void Actor_SetWorldToHome(Actor* actor) {
@@ -1124,7 +1124,7 @@ void Actor_Init(Actor* actor, PlayState* play) {
Actor_SetFocus(actor, 0.0f);
Math_Vec3f_Copy(&actor->prevPos, &actor->world.pos);
Actor_SetScale(actor, 0.01f);
actor->targetMode = TARGET_MODE_3;
actor->attentionRangeType = ATTENTION_RANGE_3;
actor->terminalVelocity = -20.0f;
actor->xyzDistToPlayerSq = FLT_MAX;
@@ -1885,28 +1885,28 @@ f32 Attention_GetAdjustedDistSq(Actor* actor, Player* player, s16 playerShapeYaw
return actor->xyzDistToPlayerSq;
}
#define TARGET_RANGE(range, leash) \
{ SQ(range), (f32)(range) / (leash) }
#define ATTENTION_RANGES(range, lockOnLeashRange) \
{ SQ(range), (f32)(range) / (lockOnLeashRange) }
TargetRangeParams gTargetRanges[TARGET_MODE_MAX] = {
TARGET_RANGE(70, 140), // TARGET_MODE_0
TARGET_RANGE(170, 255), // TARGET_MODE_1
TARGET_RANGE(280, 5600), // TARGET_MODE_2
TARGET_RANGE(350, 525), // TARGET_MODE_3
TARGET_RANGE(700, 1050), // TARGET_MODE_4
TARGET_RANGE(1000, 1500), // TARGET_MODE_5
TARGET_RANGE(100, 105.36842), // TARGET_MODE_6
TARGET_RANGE(140, 163.33333), // TARGET_MODE_7
TARGET_RANGE(240, 576), // TARGET_MODE_8
TARGET_RANGE(280, 280000), // TARGET_MODE_9
TARGET_RANGE(2500, 3750), // TARGET_MODE_10
AttentionRangeParams gAttentionRanges[ATTENTION_RANGE_MAX] = {
ATTENTION_RANGES(70, 140), // ATTENTION_RANGE_0
ATTENTION_RANGES(170, 255), // ATTENTION_RANGE_1
ATTENTION_RANGES(280, 5600), // ATTENTION_RANGE_2
ATTENTION_RANGES(350, 525), // ATTENTION_RANGE_3
ATTENTION_RANGES(700, 1050), // ATTENTION_RANGE_4
ATTENTION_RANGES(1000, 1500), // ATTENTION_RANGE_5
ATTENTION_RANGES(100, 105.36842), // ATTENTION_RANGE_6
ATTENTION_RANGES(140, 163.33333), // ATTENTION_RANGE_7
ATTENTION_RANGES(240, 576), // ATTENTION_RANGE_8
ATTENTION_RANGES(280, 280000), // ATTENTION_RANGE_9
ATTENTION_RANGES(2500, 3750), // ATTENTION_RANGE_10
};
/**
* Checks if an actor at distance `distSq` is inside the range specified by its targetMode
* Checks if an actor at distance `distSq` is inside the range specified by its attentionRangeType
*/
s32 Attention_IsActorInRange(Actor* actor, f32 distSq) {
return distSq < gTargetRanges[actor->targetMode].rangeSq;
return distSq < gAttentionRanges[actor->attentionRangeType].rangeSq;
}
/**
@@ -1915,7 +1915,7 @@ s32 Attention_IsActorInRange(Actor* actor, f32 distSq) {
* Passing true to ignoreLeash avoids the distance and yaw checks, and considers the actor inside the leash distance.
*/
s32 Attention_OutsideLeashRange(Actor* actor, Player* player, s32 ignoreLeash) {
if ((actor->update == NULL) || !(actor->flags & ACTOR_FLAG_TARGETABLE) ||
if ((actor->update == NULL) || !(actor->flags & ACTOR_FLAG_ATTENTION_ENABLED) ||
(actor->flags & ACTOR_FLAG_LOCK_ON_DISABLED)) {
return true;
}
@@ -1933,7 +1933,7 @@ s32 Attention_OutsideLeashRange(Actor* actor, Player* player, s32 ignoreLeash) {
distSq = actor->xyzDistToPlayerSq;
}
return !Attention_IsActorInRange(actor, gTargetRanges[actor->targetMode].leashScale * distSq);
return !Attention_IsActorInRange(actor, gAttentionRanges[actor->attentionRangeType].leashScale * distSq);
}
return false;
@@ -3533,7 +3533,7 @@ bool Attention_InTargetableScreenRegion(PlayState* play, Actor* actor) {
* Search for targetable actors of the `actorCategory` category.
*
* Looks for the actor of said category with higher targetPriority and the one that is nearest to player. This actor
* must be within the range (relative to player) speicified by its targetMode.
* must be within the range (relative to player) speicified by its attentionRangeType.
*
* The actor must be on-screen
*
@@ -3549,7 +3549,7 @@ bool Attention_InTargetableScreenRegion(PlayState* play, Actor* actor) {
* - Not be Player itself.
* - It must be targetable or ACTOR_FLAG_40000000
* - Not be the already targeted actor, unless it has the ACTOR_FLAG_80000 flag
* - Be withing the range specified by its targetMode.
* - Be withing the range specified by its attentionRangeType.
* - It must be on-screen (within a margin)
* - Must not be blocked by a surface (?)
*
@@ -3573,13 +3573,13 @@ void Attention_FindTargetableActorForCategory(PlayState* play, ActorContext* act
}
// Actor must be at least either targetable or ACTOR_FLAG_40000000
if (!(actor->flags & (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_40000000))) {
if (!(actor->flags & (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_40000000))) {
continue;
}
// Determine the closest enemy actor to player within a range. Used for playing enemy background music.
if ((actorCategory == ACTORCAT_ENEMY) &&
CHECK_FLAG_ALL(actor->flags, ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_HOSTILE)) {
CHECK_FLAG_ALL(actor->flags, ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE)) {
if ((actor->xyzDistToPlayerSq < SQ(500.0f)) && (actor->xyzDistToPlayerSq < sBgmEnemyDistSq)) {
actorCtx->attention.bgmEnemy = actor;
sBgmEnemyDistSq = actor->xyzDistToPlayerSq;
@@ -3593,7 +3593,8 @@ void Attention_FindTargetableActorForCategory(PlayState* play, ActorContext* act
distSq = Attention_GetAdjustedDistSq(actor, player, sTargetPlayerRotY);
isNearestTargetableActor = (actor->flags & ACTOR_FLAG_TARGETABLE) && (distSq < sTargetableNearestActorDistSq);
isNearestTargetableActor =
(actor->flags & ACTOR_FLAG_ATTENTION_ENABLED) && (distSq < sTargetableNearestActorDistSq);
phi_s2_2 = (actor->flags & ACTOR_FLAG_40000000) && (distSq < D_801ED8D0);
if (!isNearestTargetableActor && !phi_s2_2) {
@@ -4621,10 +4622,10 @@ s16 func_800BDB6C(Actor* actor, PlayState* play, s16 arg2, f32 arg3) {
}
if (arg3 < phi_f2) {
actor->flags &= ~ACTOR_FLAG_TARGETABLE;
actor->flags &= ~ACTOR_FLAG_ATTENTION_ENABLED;
Math_SmoothStepToS(&arg2, 0, 6, 0x14, 1);
} else {
actor->flags |= ACTOR_FLAG_TARGETABLE;
actor->flags |= ACTOR_FLAG_ATTENTION_ENABLED;
Math_SmoothStepToS(&arg2, 0xFF, 6, 0x14, 1);
}
src/code/z_camera.c
+2 -1
View File
@@ -1275,7 +1275,8 @@ f32 Camera_CalcSlopeYAdj(Vec3f* floorNorm, s16 playerYRot, s16 eyeAtYaw, f32 adj
}
f32 func_800CD6CC(Actor* actor) {
return sqrtf(gTargetRanges[actor->targetMode].rangeSq / gTargetRanges[actor->targetMode].leashScale);
return sqrtf(gAttentionRanges[actor->attentionRangeType].rangeSq /
gAttentionRanges[actor->attentionRangeType].leashScale);
}
/**
src/code/z_en_a_keep.c
+2 -2
View File
@@ -1,7 +1,7 @@
#include "global.h"
#include "assets/objects/gameplay_keep/gameplay_keep.h"
#define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY)
#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY)
#define THIS ((EnAObj*)thisx)
@@ -46,7 +46,7 @@ static ColliderCylinderInit sCylinderInit = {
};
static InitChainEntry sInitChain[] = {
ICHAIN_U8(targetMode, TARGET_MODE_0, ICHAIN_STOP),
ICHAIN_U8(attentionRangeType, ATTENTION_RANGE_0, ICHAIN_STOP),
};
void EnAObj_Init(Actor* thisx, PlayState* play) {
src/code/z_en_hy_code.c
+2 -2
View File
@@ -231,7 +231,7 @@ s32 func_800F0DD4(EnHy* enHy, PlayState* play, s16 arg2, s16 arg3) {
enHy->actor.shape.rot.y = Math_Vec3f_Yaw(&enHy->actor.world.pos, &door->knobDoor.dyna.actor.world.pos);
enHy->actor.world.rot.y = enHy->actor.shape.rot.y;
enHy->actor.gravity = 0.0f;
enHy->actor.flags &= ~ACTOR_FLAG_TARGETABLE;
enHy->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED;
}
}
return ret;
@@ -239,7 +239,7 @@ s32 func_800F0DD4(EnHy* enHy, PlayState* play, s16 arg2, s16 arg3) {
s32 EnHy_SetPointFowards(EnHy* enHy, PlayState* play, f32 gravity, s16 animIndex) {
enHy->actor.gravity = gravity;
enHy->actor.flags |= ACTOR_FLAG_TARGETABLE;
enHy->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED;
EnHy_ChangeObjectAndAnim(enHy, play, animIndex);
enHy->curPoint++;
return false;
src/code/z_player_call.c
+2 -2
View File
@@ -1,8 +1,8 @@
#include "global.h"
#include "kaleido_manager.h"
#define FLAGS \
(ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_200000 | \
#define FLAGS \
(ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_200000 | \
ACTOR_FLAG_2000000 | ACTOR_FLAG_CAN_PRESS_SWITCH | ACTOR_FLAG_80000000)
ActorFunc sPlayerCallInitFunc;