summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config/SOUE01/rels/d_a_npc_beeNP/symbols.txt60
-rw-r--r--include/d/a/e/d_a_e_bc.h6
-rw-r--r--include/d/a/npc/d_a_npc_bee.h28
-rw-r--r--include/d/a/npc/d_a_npc_honeycomb.h8
-rw-r--r--include/d/a/obj/d_a_obj_spore.h5
-rw-r--r--src/REL/d/a/npc/d_a_npc_bee.cpp317
6 files changed, 373 insertions, 51 deletions
diff --git a/config/SOUE01/rels/d_a_npc_beeNP/symbols.txt b/config/SOUE01/rels/d_a_npc_beeNP/symbols.txt
index cf3a1e68..718a631a 100644
--- a/config/SOUE01/rels/d_a_npc_beeNP/symbols.txt
+++ b/config/SOUE01/rels/d_a_npc_beeNP/symbols.txt
@@ -2,46 +2,46 @@ _prolog = .text:0x00000000; // type:function size:0x2C scope:global
_epilog = .text:0x00000030; // type:function size:0x2C scope:global
_unresolved = .text:0x00000060; // type:function size:0x4 scope:global
dAcNpcBee_c_classInit__Fv = .text:0x00000070; // type:function size:0xD0
-fn_14_140 = .text:0x00000140; // type:function size:0x58
-fn_14_1A0 = .text:0x000001A0; // type:function size:0x58
-fn_14_200 = .text:0x00000200; // type:function size:0x5C
-AcNpcBeeSingleBee__ctor = .text:0x00000260; // type:function size:0x68
-fn_14_2D0 = .text:0x000002D0; // type:function size:0x90
-AcNpcBeeSingleBee__dtor = .text:0x00000360; // type:function size:0x9C
-fn_14_400 = .text:0x00000400; // type:function size:0xD0
-AcNpcBee__init = .text:0x000004D0; // type:function size:0x1DC
-fn_14_6B0 = .text:0x000006B0; // type:function size:0x8
-AcNpcBee__actuallyUpdateSwarmBees = .text:0x000006C0; // type:function size:0x6CC
-AcNpcBee__handleBeeCrawlingOnHive = .text:0x00000D90; // type:function size:0x5BC
-fn_14_1350 = .text:0x00001350; // type:function size:0xBEC
-fn_14_1F40 = .text:0x00001F40; // type:function size:0x1B0
-fn_14_20F0 = .text:0x000020F0; // type:function size:0x1B4
-AcNpcBee__update = .text:0x000022B0; // type:function size:0x88
-AcNpcBee__updateSwarmBeeColliders = .text:0x00002340; // type:function size:0x2E4
-fn_14_2630 = .text:0x00002630; // type:function size:0x5C
-fn_14_2690 = .text:0x00002690; // type:function size:0x1D4
-fn_14_2870 = .text:0x00002870; // type:function size:0x8
-fn_14_2880 = .text:0x00002880; // type:function size:0x4
-fn_14_2890 = .text:0x00002890; // type:function size:0x4
-fn_14_28A0 = .text:0x000028A0; // type:function size:0x8
+__ct__11dShpProc1_cFv = .text:0x00000140; // type:function size:0x58
+__dt__14dShpProcBase_cFv = .text:0x000001A0; // type:function size:0x58
+__dt__11dShpProc1_cFv = .text:0x00000200; // type:function size:0x5C
+__ct__18dAcNpcBeeSingleBeeFv = .text:0x00000260; // type:function size:0x68
+__dt__15dCcD_Linked_SphFv = .text:0x000002D0; // type:function size:0x90
+__dt__18dAcNpcBeeSingleBeeFv = .text:0x00000360; // type:function size:0x9C
+createHeap__11dAcNpcBee_cFv = .text:0x00000400; // type:function size:0xD0
+create__11dAcNpcBee_cFv = .text:0x000004D0; // type:function size:0x1DC
+doDelete__7fBase_cFv = .text:0x000006B0; // type:function size:0x8
+actuallyUpdateSwarmBees__11dAcNpcBee_cFv = .text:0x000006C0; // type:function size:0x6CC
+handleBeeCrawlingOnHive__11dAcNpcBee_cFP18dAcNpcBeeSingleBee = .text:0x00000D90; // type:function size:0x5BC
+fn_14_1350__11dAcNpcBee_cFP18dAcNpcBeeSingleBee = .text:0x00001350; // type:function size:0xBEC
+fn_14_1F40__11dAcNpcBee_cFP18dAcNpcBeeSingleBee = .text:0x00001F40; // type:function size:0x1B0
+fn_14_20F0__11dAcNpcBee_cFP18dAcNpcBeeSingleBee = .text:0x000020F0; // type:function size:0x1B4
+actorExecute__11dAcNpcBee_cFv = .text:0x000022B0; // type:function size:0x88
+updateSwarmBeeColliders__11dAcNpcBee_cFv = .text:0x00002340; // type:function size:0x2E4
+draw__11dAcNpcBee_cFv = .text:0x00002630; // type:function size:0x5C
+fn_14_2690__FP18dAcNpcBeeSingleBee = .text:0x00002690; // type:function size:0x1D4
+vt_0x88__11dAcEnBase_cFi = .text:0x00002870; // type:function size:0x8
+vt_0x84__11dAcEnBase_cFv = .text:0x00002880; // type:function size:0x4
+vt_0x80__11dAcEnBase_cFv = .text:0x00002890; // type:function size:0x4
+getObjectListEntry__11dAcEnBase_cFv = .text:0x000028A0; // type:function size:0x8
__dt__11dAcNpcBee_cFv = .text:0x000028B0; // type:function size:0xC4
-fn_14_2980 = .text:0x00002980; // type:function size:0x4
-fn_14_2990 = .text:0x00002990; // type:function size:0x4
-fn_14_29A0 = .text:0x000029A0; // type:function size:0x8
+drawXlu__11dShpProc1_cFv = .text:0x00002980; // type:function size:0x4
+drawOpa__11dShpProc1_cFv = .text:0x00002990; // type:function size:0x4
+@272@__dt__15dCcD_Linked_SphFv = .text:0x000029A0; // type:function size:0x8
_ctors = .ctors:0x00000000; // type:label scope:global
_dtors = .dtors:0x00000000; // type:label scope:global
lbl_14_rodata_0 = .rodata:0x00000000; // type:object size:0xC4 data:float
g_profile_NPC_BEE = .data:0x00000000; // type:object size:0x10 data:4byte
-lbl_14_data_10 = .data:0x00000010; // type:object size:0x2C
+sph = .data:0x00000010; // type:object size:0x2C
lbl_14_data_3C = .data:0x0000003C; // type:object size:0x6 data:string
lbl_14_data_44 = .data:0x00000044; // type:object size:0x6 data:string
lbl_14_data_4C = .data:0x0000004C; // type:object size:0x7 data:string
lbl_14_data_54 = .data:0x00000054; // type:object size:0x7 data:string
-lbl_14_data_60 = .data:0x00000060; // type:object size:0x10 data:4byte
+@LOCAL@createHeap__11dAcNpcBee_cFv@sModelNames = .data:0x00000060; // type:object size:0x10 data:4byte
lbl_14_data_70 = .data:0x00000070; // type:object size:0x4 data:string
lbl_14_data_74 = .data:0x00000074; // type:object size:0x28
-AcNpcBee__vtable = .data:0x0000009C; // type:object size:0x8C
-lbl_14_data_128 = .data:0x00000128; // type:object size:0x70
-lbl_14_data_198 = .data:0x00000198; // type:object size:0x58
+__vt__11dAcNpcBee_c = .data:0x0000009C; // type:object size:0x8C
+__vt__15dCcD_Linked_Sph = .data:0x00000128; // type:object size:0x70
+__vt__11dShpProc1_c = .data:0x00000198; // type:object size:0x58
lbl_14_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte
lbl_14_bss_C = .bss:0x0000000C; // type:object size:0xC align:4 data:float
diff --git a/include/d/a/e/d_a_e_bc.h b/include/d/a/e/d_a_e_bc.h
index 520aa7d9..bf5671ad 100644
--- a/include/d/a/e/d_a_e_bc.h
+++ b/include/d/a/e/d_a_e_bc.h
@@ -45,8 +45,14 @@ public:
STATE_FUNC_DECLARE(dAcEbc_c, AAttack);
STATE_FUNC_DECLARE(dAcEbc_c, ADamage);
+ u8 getField_0x130D() const {
+ return field_0x130D;
+ }
+
private:
/* 0x??? */ STATE_MGR_DECLARE(dAcEbc_c);
+ /* 0x??? */ u8 field_unk[0xF59];
+ /* 0x130D */ u8 field_0x130D;
};
#endif
diff --git a/include/d/a/npc/d_a_npc_bee.h b/include/d/a/npc/d_a_npc_bee.h
index 6d161ac1..4c840438 100644
--- a/include/d/a/npc/d_a_npc_bee.h
+++ b/include/d/a/npc/d_a_npc_bee.h
@@ -4,6 +4,7 @@
#include "common.h"
#include "d/a/d_a_base.h"
#include "d/a/e/d_a_en_base.h"
+#include "d/a/npc/d_a_npc_honeycomb.h"
#include "d/a/obj/d_a_obj_base.h"
#include "d/col/cc/d_cc_d.h"
#include "d/d_cc.h"
@@ -12,6 +13,8 @@
#include "m/m_vec.h"
#include "nw4r/g3d/res/g3d_resfile.h"
+class dAcOSpore_c;
+
class dAcNpcBeeSingleBee {
public:
enum State {
@@ -35,14 +38,16 @@ public:
/* 0x009 */ u8 field_0x009[0xc-9];
/* 0x00C */ s16 mRotY;
/* 0x00E */ s16 field_0x00E;
- /* 0x010 */ u8 field_0x010[0x18-0x10];
+ /* 0x010 */ f32 field_0x010;
+ /* 0x014 */ f32 field_0x014;
/* 0x018 */ mVec3_c mPos;
- /* 0x024 */ u8 field_0x024[0x3C-0x24];
+ /* 0x024 */ mVec3_c field_0x024;
+ /* 0x030 */ u8 field_0x030[0x3C-0x30];
/* 0x03C */ mVec3_c field_0x03C;
/* 0x048 */ mVec3_c field_0x048;
/* 0x054 */ mVec3_c field_0x054;
/* 0x060 */ mAng3_c field_0x060;
- /* 0x066 */ u8 field_0x066[0x6C-0x66];
+ /* 0x066 */ mAng3_c field_0x066;
/* 0x06C */ dCcD_Linked_Sph mCollider;
};
@@ -53,11 +58,16 @@ public:
virtual ~dAcNpcBee_c() {}
virtual bool createHeap() override;
virtual int create() override;
- virtual int execute() override;
+ virtual int actorExecute() override;
+ virtual int draw() override;
void updateSwarmBeeColliders();
void actuallyUpdateSwarmBees();
+ void handleBeeCrawlingOnHive(dAcNpcBeeSingleBee* bee);
+ void fn_14_1350(dAcNpcBeeSingleBee* bee);
void fn_14_1F40(dAcNpcBeeSingleBee* bee);
+ u32 fn_14_2630();
u32 fn_14_2690(dAcNpcBeeSingleBee* bee);
+ void fn_14_20F0(dAcNpcBeeSingleBee* bee);
private:
/* 0x0378 */ u8 mSwarmBeeCount;
@@ -65,16 +75,18 @@ private:
/* 0x037A */ u8 mSceneflag;
/* 0x037B */ u8 field_0x037B;
/* 0x037C */ s16 field_0x037C;
- /* 0x037E */ u8 field_0x037E[0x388-0x37E];
+ /* 0x037E */ u8 field_0x037E[0x380-0x37E];
+ /* 0x0380 */ f32 field_0x0380;
+ /* 0x0384 */ u8 field_0x0384[0x388-0x384];
/* 0x0388 */ nw4r::g3d::ResFile mRes;
/* 0x038C */ dShpProc1_c mBeeModels[4];
/* 0x045C */ dAcNpcBeeSingleBee mBees[100];
- /* 0xB80C */ dAcRef_c<dAcObjBase_c> mHiveRef;
+ /* 0xB80C */ dAcRef_c<dAcNpcHc_c> mHiveRef;
/* 0xB818 */ dAcRef_c<dAcObjBase_c> mAttackRef;
/* 0xB824 */ dColliderLinkedList mColliderList;
/* 0xB830 */ mVec3_c field_0xB830;
- /* 0xB834 */ dAcObjBase_c* mAttackActor;
- /* 0xB838 */ u8 field_0xB838[0xB844-0xB838];
+ /* 0xB83C */ dAcObjBase_c* mAttackActor;
+ /* 0xB840 */ dAcOSpore_c* field_0xB840;
};
#endif
diff --git a/include/d/a/npc/d_a_npc_honeycomb.h b/include/d/a/npc/d_a_npc_honeycomb.h
index a0c3c7dd..79e6c142 100644
--- a/include/d/a/npc/d_a_npc_honeycomb.h
+++ b/include/d/a/npc/d_a_npc_honeycomb.h
@@ -2,13 +2,19 @@
#define D_A_NPC_HONEYCOMB_H
#include "d/a/e/d_a_en_base.h"
+#include "m/m_vec.h"
class dAcNpcHc_c : public dAcEnBase_c {
public:
dAcNpcHc_c() {}
virtual ~dAcNpcHc_c() {}
-private:
+// private:
+/* 0x378 */ u8 field_0x378[0x915-0x378];
+/* 0x915 */ u8 field_0x915;
+/* 0x916 */ u8 field_0x916;
+/* 0x917 */ u8 field_0x917[0x928-0x917];
+/* 0x928 */ mVec3_c field_0x928;
};
#endif
diff --git a/include/d/a/obj/d_a_obj_spore.h b/include/d/a/obj/d_a_obj_spore.h
index 1f787c6e..2f5418c7 100644
--- a/include/d/a/obj/d_a_obj_spore.h
+++ b/include/d/a/obj/d_a_obj_spore.h
@@ -2,12 +2,17 @@
#define D_A_O_SPORE_H
#include "d/a/obj/d_a_obj_base.h"
+#include "f/f_list_mg.h"
class dAcOSpore_c : public dAcObjBase_c {
public:
dAcOSpore_c() {}
virtual ~dAcOSpore_c() {}
+ static fLiNdBa_c* getListHead();
+
+
private:
+static fLiMgBa_c sSpores;
};
#endif
diff --git a/src/REL/d/a/npc/d_a_npc_bee.cpp b/src/REL/d/a/npc/d_a_npc_bee.cpp
index d80c8603..b1b657f6 100644
--- a/src/REL/d/a/npc/d_a_npc_bee.cpp
+++ b/src/REL/d/a/npc/d_a_npc_bee.cpp
@@ -3,20 +3,33 @@
#include "c/c_math.h"
#include "common.h"
#include "d/a/d_a_player.h"
+#include "d/a/e/d_a_e_bc.h"
+#include "d/a/npc/d_a_npc_honeycomb.h"
#include "d/a/obj/d_a_obj_base.h"
+#include "d/a/obj/d_a_obj_spore.h"
#include "d/col/bg/d_bg_s.h"
#include "d/col/bg/d_bg_s_gnd_chk.h"
+#include "d/col/bg/d_bg_s_lin_chk.h"
#include "d/col/cc/d_cc_d.h"
+#include "d/d_camera.h"
+#include "d/d_player_act.h"
#include "d/d_rumble.h"
+#include "d/d_sc_game.h"
#include "d/flag/sceneflag_manager.h"
+#include "d/snd/d_snd_wzsound.h"
#include "f/f_base.h"
+#include "f/f_manager.h"
#include "f/f_profile_name.h"
+#include "m/m_angle.h"
+#include "m/m_mtx.h"
#include "m/m_vec.h"
#include "nw4r/g3d/res/g3d_resfile.h"
#include "nw4r/g3d/res/g3d_resmat.h"
#include "nw4r/g3d/res/g3d_resmdl.h"
#include "nw4r/g3d/res/g3d_resshp.h"
+#include "nw4r/math/math_triangular.h"
#include "s/s_Math.h"
+#include <cmath>
SPECIAL_ACTOR_PROFILE(NPC_BEE, dAcNpcBee_c, fProfile::NPC_BEE, 0x123, 0, 0);
@@ -67,25 +80,259 @@ int dAcNpcBee_c::create() {
if (honeycomb == nullptr) {
return FAILED;
} else {
- mHiveRef.link(honeycomb);
+ mHiveRef.link(static_cast<dAcNpcHc_c*>(honeycomb));
mAttackRef.link(dAcPy_c::GetLinkM());
}
return SUCCEEDED;
}
-int dAcNpcBee_c::execute() {
- field_0x037C++;
- updateSwarmBeeColliders();
- actuallyUpdateSwarmBees();
- if (field_0x0379) {
- field_0x0379--;
- if (field_0x0379 == 7) {
- dRumble_c::start(dRumble_c::sRumblePreset1, 1);
- } else if (field_0x0379 == 5) {
- dRumble_c::stop(-1);
+void dAcNpcBee_c::actuallyUpdateSwarmBees() {
+ if (mHiveRef.isLinked()) {
+ setStartingPosition(mHiveRef.get()->field_0x928);
+ }
+ dAcPy_c *player = dAcPy_c::GetLink2();
+ if ((field_0x037C & 0xF) == 0) {
+ mAttackRef.link(player);
+ bool bVar3 = true;
+ fLiNdBa_c *current = dAcOSpore_c::getListHead();
+ if (current != nullptr) {
+ for (;current != nullptr;current = current->getNext()) {
+ dAcOSpore_c* spore = static_cast<dAcOSpore_c*>(current->p_owner);
+ if (spore != nullptr && (s32)(spore->mParams & 0xF) == 1) {
+ mVec3_c& sporePos = spore->mPosition;
+ if (spore->mPosition.squareDistanceToXZ(field_0xB830) < 1000000.f &&
+ std::fabsf(spore->mPosition.y - field_0xB830.y) < 500.f) {
+ if (!dBgS_ObjLinChk::LineCross(&field_0xB830, &sporePos, this)) {
+ mAttackRef.link(spore);
+ bVar3 = false;
+ field_0xB840 = spore;
+ break;
+ }
+ }
+ }
+ }
+ }
+ if (bVar3) {
+ dAcEbc_c *boko = nullptr;
+ while((boko = static_cast<dAcEbc_c*>(fManager_c::searchBaseByProfName(fProfile::E_BC, boko)))) {
+ if (boko->getField_0x130D()) continue;
+ f32 distToPlayer = field_0xB830.distance(dAcPy_c::GetLink()->mPositionCopy2);
+ f32 distToBoko = field_0xB830.distance(boko->mPositionCopy2);
+ if (distToBoko < distToPlayer) {
+ mAttackRef.link(boko);
+ break;
+ }
+ }
}
}
- return SUCCEEDED;
+ mAttackActor = mAttackRef.get();
+ if (mAttackActor == nullptr) {
+ mAttackActor = player;
+ }
+ dAcNpcBeeSingleBee* bee = &mBees[0];
+ u8 beesAlive = 0;
+ int uVar13 = 0;
+ static mVec3_c someVec(10000.f, -20000.f, 50000.f);
+ dCamera_c* camera = dScGame_c::getCamera();
+ bool bVar3 = true;
+ int iVar12 = 0;
+ int iVar17 = 0;
+ field_0x0380 = mStartingPos.distance(mAttackActor->mPositionCopy2);
+ mPosition = mStartingPos;
+ for (int i = 0; i < mSwarmBeeCount; i++, bee++) {
+ bool bVar9 = true;
+ mMtx_c mtx;
+ if (bee->mBeeState != dAcNpcBeeSingleBee::BEE_STATE_DEAD) {
+ beesAlive++;
+ bee->field_0x03C = bee->mPos;
+ if (bee->field_0x002) {
+ bee->field_0x002--;
+ }
+ if(bee->field_0x006) {
+ bee->field_0x006--;
+ }
+ if (bee->mBeeState == dAcNpcBeeSingleBee::BEE_STATE_CRAWL) {
+ handleBeeCrawlingOnHive(bee);
+ bee->field_0x006 = 5;
+ } else {
+ bee->mRotY++;
+ if (bee->mBeeState <= dAcNpcBeeSingleBee::BEE_STATE_FLY_UP2) {
+ fn_14_1350(bee);
+ iVar12++;
+ if (bVar3) {
+ bVar3 = false;
+ mPosition = bee->mPos;
+ }
+ } else if (bee->mBeeState == dAcNpcBeeSingleBee::BEE_STATE_UNK4) {
+ fn_14_20F0(bee);
+ } else if (bee->mBeeState == dAcNpcBeeSingleBee::BEE_STATE_RISE) {
+ fn_14_1F40(bee);
+ }
+ }
+ if (bee->field_0x008 == 0) {
+ mVec3_c localA4 = bee->mPos - camera->getPosition();
+ if (localA4.absXZ() < 3000.f) {
+ localA4.normalize();
+ mVec3_c localB0 = camera->getTarget() - camera->getPosition();
+ localB0.normalize();
+ if (localB0.dot(localA4) > 0.5f) {
+ if (bee->field_0x003) {
+ if (bee->mRotY & 1) {
+ uVar13 = 0;
+ } else {
+ uVar13 = 1;
+ }
+ } else {
+ s32 tmp = -(bee->mRotY >> 2 & 1);
+ tmp += 3;
+ uVar13 = tmp;
+ }
+ if (bee->mBeeState == dAcNpcBeeSingleBee::BEE_STATE_CRAWL) {
+ mtx.transS(bee->mPos);
+ mtx.ZrotM(bee->field_0x060.x);
+ mtx.XrotM(bee->field_0x060.z);
+ mtx.YrotM(bee->field_0x060.y);
+ mtx.XrotM(0x8000);
+ } else {
+ mtx.transS(bee->mPos);
+ mtx.YrotM(bee->field_0x066.y);
+ mtx.XrotM(bee->field_0x066.x);
+ mtx.ZrotM(bee->field_0x066.z);
+ }
+ bVar9 = false;
+ }
+ }
+ }
+ field_0xB830 = bee->mPos;
+ }
+
+ for (u32 uVar8 = 0, iVar18 = 4; iVar18 != 0; uVar8++, iVar18--) {
+ if (!bVar9 && (uVar8 & 0xFF) == (uVar13 & 0xFF)) {
+ mBeeModels[uVar8 & 0xFF].setDrawDisabled(i, false);
+ mBeeModels[uVar8 & 0xFF].setTransform(i, mtx);
+ } else {
+ mBeeModels[uVar8 & 0xFF].setDrawDisabled(i, true);
+ }
+ }
+ if (!bVar9 && bee->field_0x006 == 0) {
+ bee->mCollider.SetC(bee->mPos);
+ } else {
+ bee->mCollider.SetC(someVec);
+ }
+ }
+ if (iVar12 != 0) {
+ holdSoundWithIntParam(SE_Bee_FLY_LV, iVar12);
+ }
+ mColliderList.registerColliders();
+ if (!beesAlive) {
+ deleteRequest();
+ }
+}
+
+void dAcNpcBee_c::handleBeeCrawlingOnHive(dAcNpcBeeSingleBee* bee) {
+ f32 fVar7 = 0.0f;
+ dAcNpcHc_c* hive = mHiveRef.get();
+ if (hive == nullptr || hive->mHealth == 0) {
+ bee->mBeeState = dAcNpcBeeSingleBee::BEE_STATE_DEAD;
+ } else {
+ if (bee->field_0x008) {
+ if (hive->mHealth == 1) {
+ bee->field_0x008 = 0;
+ bee->field_0x024.x = cM::rndFX(300.f);
+ bee->field_0x024.z = cM::rndFX(300.f);
+ } else {
+ bee->mPos = mStartingPos;
+ return;
+ }
+ }
+ if (dAcPy_c::GetLink()->getRidingActorType() != daPlayerActBase_c::RIDING_LOFTWING && (mAttackActor->getPosition().y - getPosition().y) < 0.f && bee->field_0x005 != 4) {
+ f32 compSpeed = mAttackActor->getSpeed() * 20.f + 350.f;
+ if (hive->field_0x915 >= 5 || hive->mHealth == 1 || (hive->field_0x916 == 0 && field_0x0380 < compSpeed)) {
+ bee->field_0x005 = 4;
+ bee->field_0x002 = cM::rndF(15.f);
+ } else if (bee->field_0x005 != 2 && hive->field_0x915 != 0) {
+ bee->field_0x002 = cM::rndF(70.f) + 30.f;
+ bee->field_0x005 = 2;
+ }
+ }
+ mVec3_c local_74;
+ mVec3_c local_80 = bee->field_0x054 - bee->field_0x024;
+ bee->field_0x003 = 0;
+ local_74 = local_80;
+ if (bee->field_0x005 == 0) {
+ bee->field_0x010 = 0.f;
+ if (bee->field_0x002 == 0) {
+ if (cM::rnd() < 0.02f) {
+ bee->field_0x002 = cM::rndF(70.f) + 30.f;
+ bee->field_0x005 = 2;
+ } else {
+ bee->field_0x002 = cM::rndF(30.f) + 5.f;
+ bee->field_0x054.x = cM::rndFX(300.f);
+ bee->field_0x054.z = cM::rndFX(300.f);
+ bee->field_0x005 = 1;
+ }
+ }
+ } else if (bee->field_0x005 == 1) {
+ bee->mRotY++;
+ sLib::addCalcAngle(bee->field_0x060.y.ref(), local_74.atan2sX_Z(), 2, 0x400);
+ if (bee->field_0x002 == 0 || local_74.absXZ() < 10.f) {
+ bee->field_0x005 = 0;
+ bee->field_0x002 = cM::rndF(15.f) + 2.f;
+ }
+ fVar7 = 2.f;
+ } else if (bee->field_0x005 == 2) {
+ bee->field_0x003 = 1;
+ sLib::addCalcScaledDiff(&bee->field_0x010, 50.f, 0.1f, 5.f);
+ sLib::addCalcAngle(bee->field_0x060.y.ref(), local_74.atan2sX_Z(), 2, 0x800);
+ if ((bee->field_0x002 & 0x7) == 0) {
+ bee->field_0x054.x = cM::rndFX(300.f);
+ bee->field_0x054.z = cM::rndFX(300.f);
+ }
+ if (bee->field_0x002 == 0) {
+ bee->field_0x005 = 3;
+ }
+ fVar7 = 5.f;
+ } else if (bee->field_0x005 == 3) {
+ bee->field_0x003 = 1;
+ sLib::addCalcScaled(&bee->field_0x010, 1.f, 5.f);
+ if (bee->field_0x010 <= 0.1f) {
+ bee->field_0x005 = 0;
+ }
+ } else if (bee->field_0x005 == 4 && bee->field_0x002 == 0) {
+ bee->mBeeState = dAcNpcBeeSingleBee::BEE_STATE_RISE;
+ bee->field_0x005 = 0;
+ }
+ sLib::addCalcScaledDiff(&bee->field_0x014, fVar7, 0.5f, 0.5f);
+ mMtx_c mtx;
+ mtx.YrotS(bee->field_0x060.y);
+ local_74.set(0.f, 0.f, bee->field_0x014);
+ mtx.multVec(local_74, bee->field_0x048);
+ bee->field_0x024 += bee->field_0x048;
+ s16 xRot = -bee->field_0x024.x * 32768.f / 200.f;
+ s16 zRot = bee->field_0x024.z * 32768.f / 200.f;
+ local_74.y = bee->field_0x010;
+ local_74.x = 0.f;
+ local_74.z = 0.f;
+ local_74.y = -68.f - local_74.y;
+ mtx.scaleS(1.f, 1.15f, 1.f);
+ mtx.YrotM(hive->mRotation.y);
+ mtx.ZrotM(xRot);
+ mtx.XrotM(zRot);
+ mtx.multVec(local_74, bee->mPos);
+ bee->mPos += mStartingPos;
+ if (bee->field_0x003 == 0) {
+ sLib::addCalcAngle(bee->field_0x060.x.ref(), xRot, 2, 0x800);
+ sLib::addCalcAngle(bee->field_0x060.z.ref(), zRot, 2, 0x800);
+ } else {
+ bee->mRotY++;
+ sLib::addCalcAngle(bee->field_0x060.x.ref(), 0, 1, 0x1000);
+ sLib::addCalcAngle(bee->field_0x060.z.ref(), -0x8000, 1, 0x1000);
+ }
+ }
+}
+
+void dAcNpcBee_c::fn_14_1350(dAcNpcBeeSingleBee* bee) {
+
}
void dAcNpcBee_c::fn_14_1F40(dAcNpcBeeSingleBee* bee) {
@@ -111,6 +358,52 @@ void dAcNpcBee_c::fn_14_1F40(dAcNpcBeeSingleBee* bee) {
}
}
+void dAcNpcBee_c::fn_14_20F0(dAcNpcBeeSingleBee* bee) {
+ bee->mPos += bee->field_0x048;
+ bee->mPos.x += nw4r::math::SinIdx(bee->mRotY * 0x900) * 10.f;
+ bee->mPos.y += nw4r::math::SinIdx(bee->mRotY * 0xa00) * 10.f;
+ bee->mPos.z += nw4r::math::SinIdx(bee->mRotY * 0xb00) * 10.f;
+ if ((bee->mIndex & 1) != 0) {
+ bee->field_0x066.y += 0xD00;
+ } else {
+ bee->field_0x066.y -= 0xD00;
+ }
+ bee->field_0x066.x += 0xA00;
+ if (bee->field_0x002 == 0) {
+ bee->mBeeState = dAcNpcBeeSingleBee::BEE_STATE_CHASE;
+ bee->field_0x005 = 0;
+ bee->field_0x00E = cM::rndF(155.f) + 300.f;
+ }
+ fn_14_2690(bee);
+}
+
+int dAcNpcBee_c::actorExecute() {
+ field_0x037C++;
+ updateSwarmBeeColliders();
+ actuallyUpdateSwarmBees();
+ if (field_0x0379) {
+ field_0x0379--;
+ if (field_0x0379 == 7) {
+ dRumble_c::start(dRumble_c::sRumblePreset1, 1);
+ } else if (field_0x0379 == 5) {
+ dRumble_c::stop(-1);
+ }
+ }
+ return SUCCEEDED;
+}
+
+void dAcNpcBee_c::updateSwarmBeeColliders() {
+
+}
+
+int dAcNpcBee_c::draw() {
+ dShpProc1_c* model = &mBeeModels[0];
+ for (int i = 0; i < 4; i++, model++) {
+ model->entry();
+ }
+ return 1;
+}
+
u32 fn_14_2690(dAcNpcBeeSingleBee* bee) {
dBgS_ObjGndChk gndChk;
dBgS_ObjLinChk linChk;
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 01:37:35 +0000