efxEnemy progress

projectPiki · Sep 26, 2023 · 7559314 · 7559314
1 parent f8df198
commit 7559314
Show file tree

Hide file tree

Showing 10 changed files with 477 additions and 2,856 deletions.
diff --git a/include/JSystem/JParticle/JPAEmitter.h b/include/JSystem/JParticle/JPAEmitter.h
@@ -66,7 +66,7 @@ struct JPABaseParticle {
 	f32 _70;                     // _70
 	f32 _74;                     // _74
 	unknown _78;                 // _78
-	uint _7C;                    // _7C
+	uint mFlags;                 // _7C
 	s16 _80;                     // _80
 	u16 _82;                     // _82
 	f32 _84;                     // _84
@@ -124,6 +124,13 @@ struct JPABaseEmitter {
 		_B4 = scaleXY;
 	}
 
+	inline void setScaleOnly(Vector3f& scale)
+	{
+		_98.x = scale.x;
+		_98.y = scale.y;
+		_98.z = scale.z;
+	}
+
 	inline void setScaleOnly(f32 scale) { _98 = JGeometry::TVec3f(scale); }
 
 	inline void setGlobalScale(f32 x, f32 y)
@@ -222,6 +229,13 @@ struct JPABaseEmitter {
 		mColor1.a = color.a;
 	}
 
+	inline void setTranslation(f32 x, f32 y, f32 z)
+	{
+		mPosition.x = x;
+		mPosition.y = y;
+		mPosition.z = z;
+	}
+
 	Vector3f mScale;             // _00
 	JGeometry::TVec3f _0C;       // _0C
 	JGeometry::TVec3f _18;       // _18
@@ -237,7 +251,7 @@ struct JPABaseEmitter {
 	s16 _4C;                     // _4C
 	s16 _4E;                     // _4E
 	s16 _50;                     // _50
-	u16 _52;                     // _52
+	s16 mLifeTime;               // _52
 	u16 _54;                     // _54
 	JSUPtrLink _58;              // _58
 	Mtx mMatrix;                 // _68

diff --git a/include/Vector3.h b/include/Vector3.h
@@ -156,6 +156,7 @@ struct Vector3 {
 
 	f32 length() const;
 	f32 distance(Vector3&);
+	f32 distance(JGeometry::TVec3f&);
 	f32 normalise();
 
 	void read(Stream&);
@@ -388,6 +389,16 @@ inline f32 Vector3f::distance(Vector3f& them)
 	return Vector3f(diffX, diffY, diffZ).length();
 }
 
+template <>
+inline f32 Vector3f::distance(JGeometry::TVec3f& them)
+{
+	f32 diffX = this->x - them.x;
+	f32 diffY = this->y - them.y;
+	f32 diffZ = this->z - them.z;
+
+	return Vector3f(diffX, diffY, diffZ).length();
+}
+
 inline f32 _normaliseDistance(Vector3f& vec1, Vector3f& vec2)
 {
 	Vector3f vec = vec1 - vec2;

diff --git a/include/efx/Arg.h b/include/efx/Arg.h
@@ -96,6 +96,8 @@ struct ArgChou : public Arg {
 	{
 		return "ArgChou";
 	}
+
+	int mType; // _10
 };
 
 struct ArgCursor : public Arg {
@@ -191,6 +193,8 @@ struct ArgImoEat : public Arg {
 	{
 		return "ArgImoEat";
 	}
+
+	int mType; // _10
 };
 
 struct ArgKchYodare : public Arg {

diff --git a/include/efx/TBaba.h b/include/efx/TBaba.h
@@ -11,8 +11,8 @@ struct TBabaFly_ver01 : public TChasePos {
 	{
 	}
 
-	virtual bool create(Arg*); // _08
-	virtual ~TBabaFly_ver01(); // _48 (weak)
+	virtual bool create(Arg*);    // _08
+	virtual ~TBabaFly_ver01() { } // _48 (weak)
 
 	// _00      = VTBL
 	// _00-_14  = TChasePos

diff --git a/include/efx/TChou.h b/include/efx/TChou.h
@@ -7,7 +7,7 @@
 namespace efx {
 struct TChouDown : public TChasePos {
 	virtual bool create(Arg*); // _08
-	virtual ~TChouDown();      // _48 (weak)
+	virtual ~TChouDown() { }   // _48 (weak)
 
 	// _00      = VTBL
 	// _00-_14  = TChasePos

diff --git a/include/efx/TImo.h b/include/efx/TImo.h
@@ -12,7 +12,7 @@ struct TImoEat : public TChaseMtx {
 	}
 
 	virtual bool create(Arg*); // _08
-	virtual ~TImoEat();        // _48 (weak)
+	virtual ~TImoEat() { }     // _48 (weak)
 
 	// _00      = VTBL
 	// _00-_14  = TChaseMtx
@@ -25,7 +25,7 @@ struct TImoSmoke : public TChasePos {
 	}
 
 	virtual bool create(Arg*); // _08
-	virtual ~TImoSmoke();      // _48 (weak)
+	virtual ~TImoSmoke() { }   // _48 (weak)
 
 	// _00      = VTBL
 	// _00-_14  = TChasePos

diff --git a/include/efx/TJgm.h b/include/efx/TJgm.h
@@ -22,7 +22,7 @@ struct TJgmAttackW : public TChasePosYRot3 {
 
 struct TJgmBack : public TChasePos {
 	virtual bool create(Arg*); // _08
-	virtual ~TJgmBack();       // _48 (weak)
+	virtual ~TJgmBack() { }    // _48 (weak)
 
 	// _00      = VTBL
 	// _00-_14  = TChasePos

diff --git a/include/efx/TPan.h b/include/efx/TPan.h
@@ -25,7 +25,7 @@ struct TPanHide : public TForever {
 	}
 
 	virtual bool create(Arg*); // _08
-	virtual ~TPanHide();       // _48 (weak)
+	virtual ~TPanHide() { }    // _48 (weak)
 
 	// _00     = VTBL
 	// _00-_10 = TForever
@@ -38,7 +38,7 @@ struct TPanSmoke : public TChasePos {
 	}
 
 	virtual bool create(Arg*); // _08
-	virtual ~TPanSmoke();      // _48 (weak)
+	virtual ~TPanSmoke() { }   // _48 (weak)
 
 	// _00     = VTBL
 	// _00-_14 = TChasePos

diff --git a/include/efx/TTank.h b/include/efx/TTank.h
@@ -97,8 +97,12 @@ struct TTankFire : public TBase {
 	}
 
 	virtual bool create(Arg*); // _08
-	virtual void forceKill();  // _0C (weak)
-	virtual void fade()        // _10 (weak)
+	virtual void forceKill()
+	{
+		mEfxABC.forceKill();
+		mEfxIND.forceKill();
+	}                   // _0C (weak)
+	virtual void fade() // _10 (weak)
 	{
 		mEfxABC.fade();
 		mEfxIND.fade();
@@ -163,8 +167,14 @@ struct TTankWat : public TChaseMtx4 {
 	}
 
 	virtual bool create(Arg*); // _08
-	virtual void forceKill();  // _0C (weak)
-	virtual void fade()        // _10 (weak)
+	virtual void forceKill()
+	{
+		TSyncGroup4::forceKill();
+		if (mParticleCallBack.mEfxHit != nullptr) {
+			mParticleCallBack.mEfxHit->forceKill();
+		}
+	}                   // _0C (weak)
+	virtual void fade() // _10 (weak)
 	{
 		TChaseMtx4::fade();
 		if (mParticleCallBack.mEfxHit) {