Added Inherits(Angular)VelWhenDetached to Attachables

Author: comradeshook

Source/Entities/Attachable.cpp

@@ -47,6 +47,8 @@ void Attachable::Clear() {
 	m_InheritsRotAngle = true;
 	m_InheritedRotAngleOffset = 0;
 	m_InheritsFrame = false;
+	m_InheritsVelWhenDetached = 0.0F;
+	m_InheritsAngularVelWhenDetached = 0.0F;
 
 	m_AtomSubgroupID = -1L;
 	m_CollidesWithTerrainWhileAttached = true;
@@ -96,6 +98,8 @@ int Attachable::Create(const Attachable& reference) {
 	m_InheritsRotAngle = reference.m_InheritsRotAngle;
 	m_InheritedRotAngleOffset = reference.m_InheritedRotAngleOffset;
 	m_InheritsFrame = reference.m_InheritsFrame;
+	m_InheritsVelWhenDetached = reference.m_InheritsVelWhenDetached;
+	m_InheritsAngularVelWhenDetached = reference.m_InheritsAngularVelWhenDetached;
 
 	m_AtomSubgroupID = GetUniqueID();
 	m_CollidesWithTerrainWhileAttached = reference.m_CollidesWithTerrainWhileAttached;
@@ -144,6 +148,8 @@ int Attachable::ReadProperty(const std::string_view& propName, Reader& reader) {
 	MatchForwards("InheritedRotAngleRadOffset") MatchProperty("InheritedRotAngleOffset", { reader >> m_InheritedRotAngleOffset; });
 	MatchProperty("InheritedRotAngleDegOffset", { m_InheritedRotAngleOffset = DegreesToRadians(std::stof(reader.ReadPropValue())); });
 	MatchProperty("InheritsFrame", { reader >> m_InheritsFrame; });
+	MatchProperty("InheritsVelWhenDetached", { reader >> m_InheritsVelWhenDetached; });
+	MatchProperty("InheritsAngularVelWhenDetached", { reader >> m_InheritsAngularVelWhenDetached; });
 	MatchProperty("CollidesWithTerrainWhileAttached", { reader >> m_CollidesWithTerrainWhileAttached; });
 	MatchProperty("IgnoresParticlesWhileAttached", { reader >> m_IgnoresParticlesWhileAttached; });
 	MatchProperty("AddPieSlice", { m_PieSlices.emplace_back(std::unique_ptr<PieSlice>(dynamic_cast<PieSlice*>(g_PresetMan.ReadReflectedPreset(reader)))); });
@@ -170,6 +176,8 @@ int Attachable::Save(Writer& writer) const {
 	writer.NewPropertyWithValue("InheritsHFlipped", ((m_InheritsHFlipped == 0 || m_InheritsHFlipped == 1) ? m_InheritsHFlipped : 2));
 	writer.NewPropertyWithValue("InheritsRotAngle", m_InheritsRotAngle);
 	writer.NewPropertyWithValue("InheritedRotAngleOffset", m_InheritedRotAngleOffset);
+	writer.NewPropertyWithValue("InheritsVelWhenDetached", m_InheritsVelWhenDetached);
+	writer.NewPropertyWithValue("InheritsAngularVelWhenDetached", m_InheritsAngularVelWhenDetached);
 
 	writer.NewPropertyWithValue("CollidesWithTerrainWhileAttached", m_CollidesWithTerrainWhileAttached);
 	writer.NewPropertyWithValue("IgnoresParticlesWhileAttached", m_IgnoresParticlesWhileAttached);

Source/Entities/Attachable.h

@@ -268,6 +268,14 @@ namespace RTE {
 		/// Sets whether or not this Attachable inherits its Frame from its parent, if attached.
 		/// @param inheritsFrame Whether or not to inherit its parent's Frame.
 		void SetInheritsFrame(bool inheritsFrame) { m_InheritsFrame = inheritsFrame; }
+
+		/// How much of the root parent's velocity this attachable inherits when detached
+		/// @return The proportion of the velocity inherited. 0.1 = 10% inheritance.
+		float InheritsVelocityWhenDetached() { return m_InheritsVelWhenDetached; }
+
+		/// How much of the root parent's angular velocity this attachable inherits when detached
+		/// @return The proportion of the angular velocity inherited. 0.1 = 10% inheritance.
+		float InheritsAngularVelocityWhenDetached() { return m_InheritsAngularVelWhenDetached; }
 #pragma endregion
 
 #pragma region Collision Management
@@ -437,6 +445,9 @@ namespace RTE {
 		float m_InheritedRotAngleOffset; //!< The offset by which this Attachable should be rotated when it's set to inherit its parent's rotation angle. Defaults to 0.
 		bool m_InheritsFrame; //!< Whether this Attachable should inherit its parent's Frame. Defaults to false.
 
+		float m_InheritsVelWhenDetached; //!< How much of the parents velocity this attachable inherits when detached
+		float m_InheritsAngularVelWhenDetached; //!< How much of the parents angular velocity this attachable inherits when detached
+
 		long m_AtomSubgroupID; //!< The Atom IDs this' atoms will have when attached and added to a parent's AtomGroup.
 		bool m_CollidesWithTerrainWhileAttached; //!< Whether this attachable currently has terrain collisions enabled while it's attached to a parent.
 		bool m_IgnoresParticlesWhileAttached; //!< Whether this Attachable should ignore collisions with single-atom MOs while attached.