Ability to reset soldier rank after transformation

src/Mod/RuleSoldierTransformation.cpp

@@ -32,7 +32,7 @@ RuleSoldierTransformation::RuleSoldierTransformation(const std::string &name, in
 	_allowsDeadSoldiers(false), _allowsLiveSoldiers(false), _allowsWoundedSoldiers(false),
 	_listOrder(listOrder), _cost(0), _transferTime(0), _recoveryTime(0), _minRank(0), _includeBonusesForMinStats(false),
 	_showMinMax(false), _lowerBoundAtMinStats(true), _upperBoundAtMaxStats(false), _upperBoundAtStatCaps(false), _upperBoundType(0),
-	_reset(false)
+	_reset(false), _resetRank(false)
 {
 }
 
@@ -88,6 +88,7 @@ void RuleSoldierTransformation::load(const YAML::Node &node, Mod* mod)
 	_upperBoundAtStatCaps = node["upperBoundAtStatCaps"].as<bool >(_upperBoundAtStatCaps);
 	_upperBoundType = node["upperBoundType"].as<int>(_upperBoundType);
 	_reset = node["reset"].as<bool >(_reset);
+	_resetRank = node["resetRank"].as<bool >(_resetRank);
 	_soldierBonusType = node["soldierBonusType"].as<std::string >(_soldierBonusType);
 }
 
@@ -360,6 +361,15 @@ bool RuleSoldierTransformation::getReset() const
 	return _reset;
 }
 
+/**
+ * Gets whether or not this project should reset the rank of the destination soldier to rookie
+ * @return Reset the rank to rookie?
+ */
+bool RuleSoldierTransformation::getResetRank() const
+{
+	return _resetRank;
+}
+
 /**
  * Gets the type of soldier bonus assigned by this project
  * @return The soldier bonus type

src/Mod/RuleSoldierTransformation.h

@@ -53,6 +53,7 @@ class RuleSoldierTransformation
 	bool _lowerBoundAtMinStats, _upperBoundAtMaxStats, _upperBoundAtStatCaps;
 	int _upperBoundType;
 	bool _reset;
+	bool _resetRank;
 	std::string _soldierBonusType;
 
 public:
@@ -144,6 +145,8 @@ class RuleSoldierTransformation
 
 	/// Gets whether or not this project should reset info about all previous transformations and all previously assigned soldier bonuses
 	bool getReset() const;
+	/// Gets whether or not this project should reset the rank of the destination soldier to rookie
+	bool getResetRank() const;
 	/// Gets the type of soldier bonus assigned by this project
 	const std::string &getSoldierBonusType() const;
 };

src/Savegame/Soldier.cpp

@@ -1815,6 +1815,12 @@ void Soldier::transform(const Mod *mod, RuleSoldierTransformation *transformatio
 			}
 		}
 
+		// reset soldier rank, if needed
+		if (transformationRule->getResetRank())
+		{
+			_rank = RANK_ROOKIE;
+		}
+
 		// change stats
 		_currentStats += calculateStatChanges(mod, transformationRule, sourceSoldier, 0, sourceSoldierType);