mirror of
https://github.com/zeldaret/oot.git
synced 2025-08-23 07:21:19 +00:00
Document Attention/Lock-on Related Actor Flags (#2161)
* document actor flags 0, 2, 3, and 27 * format * fly -> hover * wodring
This commit is contained in:
parent
a039aeffb7
commit
2056ae5f1a
181 changed files with 616 additions and 597 deletions
|
@ -8,7 +8,7 @@
|
|||
#include "assets/objects/object_bombf/object_bombf.h"
|
||||
#include "overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h"
|
||||
|
||||
#define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_4)
|
||||
#define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_4)
|
||||
|
||||
void EnBombf_Init(Actor* thisx, PlayState* play);
|
||||
void EnBombf_Destroy(Actor* thisx, PlayState* play);
|
||||
|
@ -117,7 +117,7 @@ void EnBombf_Init(Actor* thisx, PlayState* play) {
|
|||
thisx->gravity = -1.5f;
|
||||
Actor_ChangeCategory(play, &play->actorCtx, thisx, ACTORCAT_EXPLOSIVE);
|
||||
thisx->colChkInfo.mass = 200;
|
||||
thisx->flags &= ~ACTOR_FLAG_0;
|
||||
thisx->flags &= ~ACTOR_FLAG_ATTENTION_ENABLED;
|
||||
EnBombf_SetupAction(this, EnBombf_Move);
|
||||
} else {
|
||||
thisx->colChkInfo.mass = MASS_IMMOVABLE;
|
||||
|
@ -157,7 +157,7 @@ void EnBombf_GrowBomb(EnBombf* this, PlayState* play) {
|
|||
this->timer = 180;
|
||||
this->flowerBombScale = 0.0f;
|
||||
Actor_PlaySfx(&this->actor, NA_SE_PL_PULL_UP_ROCK);
|
||||
this->actor.flags &= ~ACTOR_FLAG_0;
|
||||
this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED;
|
||||
} else {
|
||||
player->actor.child = NULL;
|
||||
player->heldActor = NULL;
|
||||
|
@ -175,7 +175,7 @@ void EnBombf_GrowBomb(EnBombf* this, PlayState* play) {
|
|||
bombFlower->isFuseEnabled = true;
|
||||
bombFlower->timer = 0;
|
||||
this->timer = 180;
|
||||
this->actor.flags &= ~ACTOR_FLAG_0;
|
||||
this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED;
|
||||
this->flowerBombScale = 0.0f;
|
||||
}
|
||||
}
|
||||
|
@ -186,7 +186,7 @@ void EnBombf_GrowBomb(EnBombf* this, PlayState* play) {
|
|||
if (bombFlower != NULL) {
|
||||
bombFlower->timer = 100;
|
||||
this->timer = 180;
|
||||
this->actor.flags &= ~ACTOR_FLAG_0;
|
||||
this->actor.flags &= ~ACTOR_FLAG_ATTENTION_ENABLED;
|
||||
this->flowerBombScale = 0.0f;
|
||||
}
|
||||
} else {
|
||||
|
@ -206,7 +206,7 @@ void EnBombf_GrowBomb(EnBombf* this, PlayState* play) {
|
|||
if (this->timer == 0) {
|
||||
this->flowerBombScale += 0.05f;
|
||||
if (this->flowerBombScale >= 1.0f) {
|
||||
this->actor.flags |= ACTOR_FLAG_0;
|
||||
this->actor.flags |= ACTOR_FLAG_ATTENTION_ENABLED;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue