ACDropShip Classname Comparisons

CHANGELOG.md

@@ -14,7 +14,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 	Actors are now more capable and responsive when digging. They will dig to their target if they cannot reach it with their jetpack (for example if there is a long vertical shaft in the route they cannot get up), and they preferentially avoid rocks, metal and other hard substances by digging around them. Actors also dig faster and spend less time idle.  
 	In the `CalculatePath` and `CalculatePathAsync` functions, the parameter `movePathToGround` has been replaced with `jumpHeight`, which is the height in metres the pathfind can jump vertically.  
 	New `Actor` Lua property `JumpHeight` (R) to estimate the jump height of the actor (in metres), based on the actor's jetpack and weight. Actors without a jetpack return 0.  
-	The new function `GetPathFindingFlyingJumpHeight()` can be used to get a jumpHeight that allows flying (i.e infinite jump height). This is also the value that `ACRocket`s and `ACDropships` return for `JumpHeight`.
+	The new function `GetPathFindingFlyingJumpHeight()` can be used to get a jumpHeight that allows flying (i.e infinite jump height). This is also the value that `ACRocket`s and `ACDropShip`s return for `JumpHeight`.
 
 - Improved locomotion.
 	Added the ability to run. When running, you cannot sharpaim whatsoever.
@@ -189,6 +189,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - Fixed issue where scripts applied to `MovableObject`s could become disordered in certain circumstances.
 
+- Fixed a minor inconsistency where `ACDropShip`s were frequently referred to as `ACDropship`s in Lua, the lower case 's' invalidating keywords where the typo occured.
+
 </details>
 
 <details><summary><b>Removed</b></summary>

Data/Base.rte/Activities/BrainVsBrain.lua

@@ -625,7 +625,7 @@ function BrainvsBrain:CreateMediumDrop(xPosLZ)
 		if craftMaxMass < 0 then
 			craftMaxMass = math.huge;
 		elseif craftMaxMass < 1 then
-			if Craft.ClassName == "ACDropship" then
+			if Craft.ClassName == "ACDropShip" then
 				Craft = RandomACDropShip("Craft", 0); -- MaxMass not defined
 			else
 				Craft = RandomACRocket("Craft", 0);	-- MaxMass not defined
@@ -685,7 +685,7 @@ function BrainvsBrain:CreateLightDrop(xPosLZ)
 		if craftMaxMass < 0 then
 			craftMaxMass = math.huge;
 		elseif craftMaxMass < 1 then
-			if Craft.ClassName == "ACDropship" then
+			if Craft.ClassName == "ACDropShip" then
 				Craft = RandomACDropShip("Craft", 0); -- MaxMass not defined
 			else
 				Craft = RandomACRocket("Craft", 0);	-- MaxMass not defined
@@ -743,7 +743,7 @@ function BrainvsBrain:CreateScoutDrop(xPosLZ)
 		if craftMaxMass < 0 then
 			craftMaxMass = math.huge;
 		elseif craftMaxMass < 1 then
-			if Craft.ClassName == "ACDropship" then
+			if Craft.ClassName == "ACDropShip" then
 				Craft = RandomACDropShip("Craft", 0); -- MaxMass not defined
 			else
 				Craft = RandomACRocket("Craft", 0); -- MaxMass not defined

Data/Base.rte/Activities/Harvester.lua

@@ -263,7 +263,7 @@ function Harvester:UpdateActivity()
 			if shipMaxMass < 0 then
 				shipMaxMass = math.huge;
 			elseif shipMaxMass < 1 then
-				if Craft.ClassName == "ACDropship" then
+				if Craft.ClassName == "ACDropShip" then
 					DeleteEntity(ship);
 					Craft = RandomACDropShip("Craft", 0); -- MaxMass not defined
 				else

Data/Base.rte/Activities/Massacre.lua

@@ -261,7 +261,7 @@ function Massacre:UpdateActivity()
 			if shipMaxMass < 0 then
 				shipMaxMass = math.huge;
 			elseif shipMaxMass < 1 then
-				if Craft.ClassName == "ACDropship" then
+				if Craft.ClassName == "ACDropShip" then
 					DeleteEntity(ship);
 					Craft = RandomACDropShip("Craft", 0); -- MaxMass not defined
 				else

Data/Base.rte/Activities/Siege.lua

@@ -612,7 +612,7 @@ function Siege:CreateMediumDrop(xPosLZ, techName)
 		if craftMaxMass < 0 then
 			craftMaxMass = math.huge;
 		elseif craftMaxMass < 1 then
-			if Craft.ClassName == "ACDropship" then
+			if Craft.ClassName == "ACDropShip" then
 				Craft = RandomACDropShip("Craft", 0); -- MaxMass not defined
 			else
 				Craft = RandomACRocket("Craft", 0); -- MaxMass not defined
@@ -666,7 +666,7 @@ function Siege:CreateLightDrop(xPosLZ, techName)
 		if craftMaxMass < 0 then
 			craftMaxMass = math.huge;
 		elseif craftMaxMass < 1 then
-			if Craft.ClassName == "ACDropship" then
+			if Craft.ClassName == "ACDropShip" then
 				Craft = RandomACDropShip("Craft", 0); -- MaxMass not defined
 			else
 				Craft = RandomACRocket("Craft", 0); -- MaxMass not defined
@@ -718,7 +718,7 @@ function Siege:CreateEngineerDrop(xPosLZ, techName)
 		if craftMaxMass < 0 then
 			craftMaxMass = math.huge;
 		elseif craftMaxMass < 1 then
-			if Craft.ClassName == "ACDropship" then
+			if Craft.ClassName == "ACDropShip" then
 				Craft = RandomACDropShip("Craft", 0); -- MaxMass not defined
 			else
 				Craft = RandomACRocket("Craft", 0); -- MaxMass not defined
@@ -767,7 +767,7 @@ function Siege:CreateScoutDrop(xPosLZ, techName)
 		if craftMaxMass < 0 then
 			craftMaxMass = math.huge;
 		elseif craftMaxMass < 1 then
-			if Craft.ClassName == "ACDropship" then
+			if Craft.ClassName == "ACDropShip" then
 				Craft = RandomACDropShip("Craft", 0); -- MaxMass not defined
 			else
 				Craft = RandomACRocket("Craft", 0); -- MaxMass not defined

Data/Base.rte/Activities/SkirmishDefense.lua

@@ -740,7 +740,7 @@ function SkirmishDefense:CreateMediumDrop(xPosLZ, Destination, Team)
 		if craftMaxMass < 0 then
 			craftMaxMass = math.huge;
 		elseif craftMaxMass < 1 then
-			if Craft.ClassName == "ACDropship" then
+			if Craft.ClassName == "ACDropShip" then
 				Craft = RandomACDropShip("Craft", 0); -- MaxMass not defined
 			else
 				Craft = RandomACRocket("Craft", 0); -- MaxMass not defined
@@ -798,7 +798,7 @@ function SkirmishDefense:CreateLightDrop(xPosLZ, Destination, Team)
 		if craftMaxMass < 0 then
 			craftMaxMass = math.huge;
 		elseif craftMaxMass < 1 then
-			if Craft.ClassName == "ACDropship" then
+			if Craft.ClassName == "ACDropShip" then
 				Craft = RandomACDropShip("Craft", 0); -- MaxMass not defined
 			else
 				Craft = RandomACRocket("Craft", 0); -- MaxMass not defined
@@ -854,7 +854,7 @@ function SkirmishDefense:CreateScoutDrop(xPosLZ, Destination, Team)
 		if craftMaxMass < 0 then
 			craftMaxMass = math.huge;
 		elseif craftMaxMass < 1 then
-			if Craft.ClassName == "ACDropship" then
+			if Craft.ClassName == "ACDropShip" then
 				Craft = RandomACDropShip("Craft", 0); -- MaxMass not defined
 			else
 				Craft = RandomACRocket("Craft", 0); -- MaxMass not defined

Data/Base.rte/Activities/WaveDefense.lua

@@ -679,7 +679,7 @@ function WaveDefense:CreateMediumDrop(xPosLZ, Destination)
 		if craftMaxMass < 0 then
 			craftMaxMass = math.huge;
 		elseif craftMaxMass < 1 then
-			if Craft.ClassName == "ACDropship" then
+			if Craft.ClassName == "ACDropShip" then
 				Craft = RandomACDropShip("Craft", 0); -- MaxMass not defined
 			else
 				Craft = RandomACRocket("Craft", 0); -- MaxMass not defined
@@ -737,7 +737,7 @@ function WaveDefense:CreateLightDrop(xPosLZ, Destination)
 		if craftMaxMass < 0 then
 			craftMaxMass = math.huge;
 		elseif craftMaxMass < 1 then
-			if Craft.ClassName == "ACDropship" then
+			if Craft.ClassName == "ACDropShip" then
 				Craft = RandomACDropShip("Craft", 0); -- MaxMass not defined
 			else
 				Craft = RandomACRocket("Craft", 0); -- MaxMass not defined
@@ -793,7 +793,7 @@ function WaveDefense:CreateScoutDrop(xPosLZ, Destination)
 		if craftMaxMass < 0 then
 			craftMaxMass = math.huge;
 		elseif craftMaxMass < 1 then
-			if Craft.ClassName == "ACDropship" then
+			if Craft.ClassName == "ACDropShip" then
 				Craft = RandomACDropShip("Craft", 0); -- MaxMass not defined
 			else
 				Craft = RandomACRocket("Craft", 0); -- MaxMass not defined

Data/Missions.rte/Activities/Maginot.lua

@@ -330,7 +330,7 @@ function MaginotMission:UpdateAttackerSpawns()
 		if self.currentFightStage >= self.fightStage.defendLeft then
 			local attackerCraft = RandomACDropShip("Craft", self.attackerTech);
 			if not attackerCraft then
-				attackerCraft = CreateACDropship("Dropship MK1", "Base.rte");
+				attackerCraft = CreateACDropShip("Dropship MK1", "Base.rte");
 			end
 
 			if attackerCraft then

Source/Entities/ACDropShip.h

@@ -80,51 +80,51 @@ namespace RTE {
 		/// Default is four.
 		int GetMaxPassengers() const override { return m_MaxPassengers > -1 ? m_MaxPassengers : 4; }
 
-		/// Gets the right side thruster of this ACDropship.
-		/// @return A pointer to the right side thruster of this ACDropship. Ownership is NOT transferred.
+		/// Gets the right side thruster of this ACDropShip.
+		/// @return A pointer to the right side thruster of this ACDropShip. Ownership is NOT transferred.
 		AEmitter* GetRightThruster() const { return m_pRThruster; }
 
-		/// Sets the right side thruster for this ACDropship.
+		/// Sets the right side thruster for this ACDropShip.
 		/// @param newThruster The new thruster to use.
 		void SetRightThruster(AEmitter* newThruster);
 
-		/// Gets the left side thruster of this ACDropship.
-		/// @return A pointer to the left side thruster of this ACDropship. Ownership is NOT transferred.
+		/// Gets the left side thruster of this ACDropShip.
+		/// @return A pointer to the left side thruster of this ACDropShip. Ownership is NOT transferred.
 		AEmitter* GetLeftThruster() const { return m_pLThruster; }
 
-		/// Sets the left side thruster for this ACDropship.
+		/// Sets the left side thruster for this ACDropShip.
 		/// @param newThruster The new thruster to use.
 		void SetLeftThruster(AEmitter* newThruster);
 
-		/// Gets the right side secondary thruster of this ACDropship.
-		/// @return A pointer to the right side secondary thruster of this ACDropship. Ownership is NOT transferred.
+		/// Gets the right side secondary thruster of this ACDropShip.
+		/// @return A pointer to the right side secondary thruster of this ACDropShip. Ownership is NOT transferred.
 		AEmitter* GetURightThruster() const { return m_pURThruster; }
 
-		/// Sets the right side secondary thruster for this ACDropship.
+		/// Sets the right side secondary thruster for this ACDropShip.
 		/// @param newThruster The new thruster to use.
 		void SetURightThruster(AEmitter* newThruster);
 
-		/// Gets the left side secondary thruster of this ACDropship.
-		/// @return A pointer to the left side secondary thruster of this ACDropship. Ownership is NOT transferred.
+		/// Gets the left side secondary thruster of this ACDropShip.
+		/// @return A pointer to the left side secondary thruster of this ACDropShip. Ownership is NOT transferred.
 		AEmitter* GetULeftThruster() const { return m_pULThruster; }
 
-		/// Sets the left side secondary thruster for this ACDropship.
+		/// Sets the left side secondary thruster for this ACDropShip.
 		/// @param newThruster The new thruster to use.
 		void SetULeftThruster(AEmitter* newThruster);
 
-		/// Gets the left side hatch of this ACDropship.
-		/// @return A pointer to the left side hatch of this ACDropship. Ownership is NOT transferred.
+		/// Gets the left side hatch of this ACDropShip.
+		/// @return A pointer to the left side hatch of this ACDropShip. Ownership is NOT transferred.
 		Attachable* GetLeftHatch() const { return m_pLHatch; }
 
-		/// Sets the left side hatch for this ACDropship.
+		/// Sets the left side hatch for this ACDropShip.
 		/// @param newHatch The new hatch to use.
 		void SetLeftHatch(Attachable* newHatch);
 
-		/// Gets the right side hatch of this ACDropship.
-		/// @return A pointer to the right side hatch of this ACDropship. Ownership is NOT transferred.
+		/// Gets the right side hatch of this ACDropShip.
+		/// @return A pointer to the right side hatch of this ACDropShip. Ownership is NOT transferred.
 		Attachable* GetRightHatch() const { return m_pRHatch; }
 
-		/// Sets the right side hatch for this ACDropship.
+		/// Sets the right side hatch for this ACDropShip.
 		/// @param newHatch The new hatch to use.
 		void SetRightHatch(Attachable* newHatch);
 
@@ -148,12 +148,12 @@ namespace RTE {
 		/// @return Current lateral control value.
 		float GetLateralControl() const { return m_LateralControl; }
 
-		/// Gets the modifier for height at which this ACDropship should hover above terrain.
-		/// @return The modifier for height at which this ACDropship should hover above terrain.
+		/// Gets the modifier for height at which this ACDropShip should hover above terrain.
+		/// @return The modifier for height at which this ACDropShip should hover above terrain.
 		float GetHoverHeightModifier() const { return m_HoverHeightModifier; }
 
-		/// Sets the modifier for height at which this ACDropship should hover above terrain.
-		/// @param newHoverHeightModifier The new modifier for height at which this ACDropship should hover above terrain.
+		/// Sets the modifier for height at which this ACDropShip should hover above terrain.
+		/// @param newHoverHeightModifier The new modifier for height at which this ACDropShip should hover above terrain.
 		void SetHoverHeightModifier(float newHoverHeightModifier) { m_HoverHeightModifier = newHoverHeightModifier; }
 
 		/// Protected member variable and method declarations