Merge branch 'development' of https://github.com/cortex-command-community/Cortex-Command-Community-Project into development

Author: Causeless

CHANGELOG.md

@@ -16,6 +16,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - New `MovableObject` Lua functions `GetScreenEffectPath()` and `SetScreenEffectPath(string pathToFile)`, which get and set the file path to the object's screen effect.
 
+- Exposed `MovableObject` INI properties `EffectStartStrength` and `EffectStopStrength` to Lua (R/W). Default range in Lua is a float from 0-1 (0%-100%), but going outside of this range is possible.
+
+- New `MovableObject` Lua function `SetEffectStrength(float strength)`, which sets both `EffectStartStrength` and `EffectStopStrength` to the given value in order to simplify setting glow strength to a specific value.
+
 </details>
 
 <details><summary><b>Changed</b></summary>

Source/Entities/MovableObject.h

@@ -405,10 +405,30 @@ namespace RTE {
 		/// @return The starting strength of the effect, 0-255.
 		int GetEffectStartStrength() const { return m_EffectStartStrength; }
 
+		/// Gets the starting strength of this MovableObject's effect as a float.
+		/// @return The starting strength of the effect, 0.0-1.0.
+		float GetEffectStartStrengthFloat() const { return static_cast<float>(m_EffectStartStrength) / 255.0f; }
+
+		/// Sets the starting strength of this MovableObject's effect.
+		/// @param strength The new starting strength of the effect, 0.0-1.0.
+		void SetEffectStartStrengthFloat(float strength) { m_EffectStartStrength = std::floor(255.0F * strength); }
+
 		/// Gets the stopping strength of this MovableObject's effect.
 		/// @return The stopping strength of the effect, 0-255.
 		int GetEffectStopStrength() const { return m_EffectStopStrength; }
 
+		/// Gets the stopping strength of this MovableObject's effect as a float.
+		/// @return The stopping strength of the effect, 0.0-1.0.
+		float GetEffectStopStrengthFloat() const { return static_cast<float>(m_EffectStopStrength) / 255.0f; }
+
+		/// Sets the stopping strength of this MovableObject's effect.
+		/// @param strength The new stopping strength of the effect, 0.0-1.0.
+		void SetEffectStopStrengthFloat(float strength) { m_EffectStopStrength = std::floor(255.0F * strength); }
+
+		/// Sets both strengths of this MovableObject's effect.
+		/// @param strength The new strengths of the effect, 0.0-1.0.
+		void SetEffectStrength(float strength) { m_EffectStartStrength = m_EffectStopStrength = std::floor(255.0F * strength); }
+
 		/// Gets whether or not this MovableObject's effect is drawn every frame.
 		/// @return Boolean indicating whether or not the effect is drawn.
 		bool GetPostEffectEnabled() const { return m_PostEffectEnabled; }

Source/Lua/LuaBindingsEntities.cpp

@@ -890,6 +890,8 @@ LuaBindingRegisterFunctionDefinitionForType(EntityLuaBindings, MovableObject) {
 	    .property("Diameter", &MovableObject::GetDiameter)
 	    .property("Scale", &MovableObject::GetScale, &MovableObject::SetScale)
 	    .property("EffectRotAngle", &MovableObject::GetEffectRotAngle, &MovableObject::SetEffectRotAngle)
+	    .property("EffectStartStrength", &MovableObject::GetEffectStartStrengthFloat, &MovableObject::SetEffectStartStrengthFloat)
+	    .property("EffectStopStrength", &MovableObject::GetEffectStopStrengthFloat, &MovableObject::SetEffectStopStrengthFloat)
 	    .property("GlobalAccScalar", &MovableObject::GetGlobalAccScalar, &MovableObject::SetGlobalAccScalar)
 	    .property("AirResistance", &MovableObject::GetAirResistance, &MovableObject::SetAirResistance)
 	    .property("AirThreshold", &MovableObject::GetAirThreshold, &MovableObject::SetAirThreshold)
@@ -989,6 +991,7 @@ LuaBindingRegisterFunctionDefinitionForType(EntityLuaBindings, MovableObject) {
 	    .def("SendMessage", &LuaAdaptersMovableObject::SendMessage1)
 	    .def("SendMessage", &LuaAdaptersMovableObject::SendMessage2)
 	    .def("RequestSyncedUpdate", &MovableObject::RequestSyncedUpdate)
+	    .def("SetEffectStrength", &MovableObject::SetEffectStrength)
 	    .def("GetScreenEffectPath", &MovableObject::GetScreenEffectPath)
 	    .def("SetScreenEffectPath", &MovableObject::SetScreenEffectPath);
 }