Added ParticleCount to Emissions, which sets how many particles they spawn per emission, and made Emissions with InheritsVel inherit velocity and angular velocity from the spin of its root parent.

Author: comradeshook

CHANGELOG.md

@@ -52,6 +52,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - Allow lua scripts to use LuaJIT's BitOp module (see https://bitop.luajit.org/api.html)
 
+- New `Emission` INI and Lua (R/W) property `ParticleCount` which sets how many particles the Emission spawns per emission.
+
 </details>
 
 <details><summary><b>Changed</b></summary>
@@ -83,6 +85,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - Almost all ctrl+* special inputs functionality (i.e restarting activity, world dumps, showing performance stats) are now mapped to right alt, to not interfere with default crouching inputs. The only exception is ctrl+arrow keys for changing console size.
 
+- `Emissions` with `InheritsVel` now also inherit velocity and angular velocity derived from the angular velocity of the parent.
+
 </details>
 
 <details><summary><b>Fixed</b></summary>

Source/Entities/AEmitter.cpp

@@ -446,9 +446,14 @@ void AEmitter::Update() {
 					scale = m_BurstScale;
 				}
 				emissionCountTotal += emissionCount;
+				if (emissionCount > 0) {
+					int extraEmissions = emission.GetParticleCount() - 1;
+					emissionCount += extraEmissions;
+				}
 				pParticle = 0;
 				emitVel.Reset();
 				parentVel = pRootParent->GetVel() * emission.InheritsVelocity();
+				Vector rotationalVel = (((RotateOffset(emission.GetOffset()) + (m_Pos - pRootParent->GetPos())) * pRootParent->GetAngularVel()).GetPerpendicular() / c_PPM) * emission.InheritsVelocity();
 
 				for (int i = 0; i < emissionCount; ++i) {
 					velMin = emission.GetMinVelocity() * scale;
@@ -472,8 +477,9 @@ void AEmitter::Update() {
 					emitVel.SetXY(velMin + RandomNum(0.0F, velRange), 0.0F);
 					emitVel.RadRotate(m_EmitAngle.GetRadAngle() + spread * RandomNormalNum());
 					emitVel = RotateOffset(emitVel);
-					pParticle->SetVel(parentVel + emitVel);
+					pParticle->SetVel(parentVel + rotationalVel + emitVel);
 					pParticle->SetRotAngle(emitVel.GetAbsRadAngle() + (m_HFlipped ? -c_PI : 0));
+					pParticle->SetAngularVel(pRootParent->GetAngularVel() * emission.InheritsVelocity());
 					pParticle->SetHFlipped(m_HFlipped);
 
 					// Scale the particle's lifetime based on life variation and throttle, as long as it's not 0

Source/Entities/Emission.cpp

@@ -23,6 +23,7 @@ void Emission::Clear() {
 	m_StopTimer.SetSimTimeLimitMS(1000000);
 	m_StopTimer.Reset();
 	m_Offset.Reset();
+	m_ParticleCount = 1;
 }
 
 /*
@@ -49,6 +50,7 @@ int Emission::Create(const Emission& reference) {
 	m_StartTimer = reference.m_StartTimer;
 	m_StopTimer = reference.m_StopTimer;
 	m_Offset = reference.m_Offset;
+	m_ParticleCount = reference.m_ParticleCount;
 
 	return 0;
 }
@@ -69,6 +71,7 @@ int Emission::ReadProperty(const std::string_view& propName, Reader& reader) {
 	MatchProperty("LifeVariation", { reader >> m_LifeVariation; });
 	MatchProperty("PushesEmitter", { reader >> m_PushesEmitter; });
 	MatchProperty("Offset", { reader >> m_Offset; });
+	MatchProperty("ParticleCount", { reader >> m_ParticleCount; });
 	MatchProperty("InheritsVel",
 	              {
 		              reader >> m_InheritsVel;
@@ -117,6 +120,8 @@ int Emission::Save(Writer& writer) const {
 	writer << m_StartTimer.GetSimTimeLimitMS();
 	writer.NewProperty("StopTimeMS");
 	writer << m_StopTimer.GetSimTimeLimitMS();
+	writer.NewProperty("ParticleCount");
+	writer << m_ParticleCount;
 
 	return 0;
 }

Source/Entities/Emission.h

@@ -126,6 +126,14 @@ namespace RTE {
 		/// @param offset New offset value.
 		void SetOffset(Vector offset) { m_Offset = offset; }
 
+		/// Returns number of particles emitted per emission.
+		/// @return Number of particles emitted per emission.
+		int GetParticleCount() const { return m_ParticleCount; }
+
+		/// Sets number of particles emitted per emission.
+		/// @param newParticleCount The new number of particles emitted per emission.
+		void SetParticleCount(int newParticleCount) { m_ParticleCount = newParticleCount; }
+
 		/// Protected member variable and method declarations
 	protected:
 		// Member variables
@@ -162,6 +170,8 @@ namespace RTE {
 		Timer m_StopTimer;
 		// Offset of the emission point from Emitter's sprite center, which gets rotated with owner Emitter
 		Vector m_Offset;
+		// The number of particles emitted per emission
+		int m_ParticleCount;
 
 		/// Private member variable and method declarations
 	private:

Source/Lua/LuaBindingsEntities.cpp

@@ -580,6 +580,7 @@ LuaBindingRegisterFunctionDefinitionForType(EntityLuaBindings, Emission) {
 	    .property("BurstSize", &Emission::GetBurstSize, &Emission::SetBurstSize)
 	    .property("Spread", &Emission::GetSpread, &Emission::SetSpread)
 	    .property("Offset", &Emission::GetOffset, &Emission::SetOffset)
+	    .property("ParticleCount", &Emission::GetParticleCount, &Emission::SetParticleCount)
 
 	    .def("ResetEmissionTimers", &Emission::ResetEmissionTimers);
 }