Merge pull request #1468 from OutpostUniverse/Feature/Colony-Ship-Morale-Multiplier

Feature/colony ship morale multiplier

Author: DanRStevens

OPHD/Constants/Numbers.h

@@ -45,6 +45,7 @@ namespace constants
 	inline constexpr int RobotCommandCapacity{10};
 
 	inline constexpr int DefaultStartingMorale{600};
+	inline constexpr int MaximumMorale{1000};
 
 	inline constexpr auto MinimumWindowSize{NAS2D::Vector{1000, 700}};
 

OPHD/States/MapViewState.cpp

@@ -158,6 +158,23 @@ namespace
 }
 
 
+const std::map<Difficulty, int> MapViewState::GracePeriod
+{
+	{Difficulty::Beginner, 30},
+	{Difficulty::Easy, 25},
+	{Difficulty::Medium, 20},
+	{Difficulty::Hard, 15}
+};
+
+const std::map<Difficulty, int> MapViewState::ColonyShipDeorbitMoraleLossMultiplier
+{
+	{Difficulty::Beginner, 1},
+	{Difficulty::Easy, 3},
+	{Difficulty::Medium, 6},
+	{Difficulty::Hard, 10}
+};
+
+
 MapViewState::MapViewState(MainReportsUiState& mainReportsState, const std::string& savegame) :
 	mCrimeExecution(mNotificationArea),
 	mTechnologyReader("tech0-1.xml"),

OPHD/States/MapViewState.h

@@ -309,13 +309,10 @@ class MapViewState : public Wrapper
 	Difficulty mDifficulty = Difficulty::Medium;
 
 	// Length of "honeymoon period" of no crime/morale updates after landing, in turns
-	std::map<Difficulty, int> gracePeriod
-	{
-		{Difficulty::Beginner, 30},
-		{Difficulty::Easy, 25},
-		{Difficulty::Medium, 20},
-		{Difficulty::Hard, 15}
-	};
+	static const std::map<Difficulty, int> GracePeriod;
+
+	//Morale loss multiplier on colonist death due to colony ship de-orbit
+	static const std::map<Difficulty, int> ColonyShipDeorbitMoraleLossMultiplier;
 
 	// MISCELLANEOUS
 	int mTurnCount = 0;

OPHD/States/MapViewStateTurn.cpp

@@ -216,7 +216,7 @@ void MapViewState::updateMorale()
 	mCurrentMorale -= structuresDestroyed;
 	mCurrentMorale -= foodProductionHit;
 
-	mCurrentMorale = std::clamp(mCurrentMorale, 0, 1000);
+	mCurrentMorale = std::clamp(mCurrentMorale, 0, constants::MaximumMorale);
 
 	mPopulationPanel.clearMoraleReasons();
 	mPopulationPanel.addMoraleReason(moraleString(Morale::Births), birthCount);
@@ -382,8 +382,8 @@ void MapViewState::checkColonyShip()
 	{
 		if (mLandersColonist > 0 || mLandersCargo > 0)
 		{
-			mCurrentMorale -= (mLandersColonist * 50) * 6; /// \todo apply a modifier to multiplier based on difficulty level.
-			if (mCurrentMorale < 0) { mCurrentMorale = 0; }
+			mCurrentMorale -= (mLandersColonist * 50) * ColonyShipDeorbitMoraleLossMultiplier.at(mDifficulty);
+			mCurrentMorale = std::clamp(mCurrentMorale, 0, constants::MaximumMorale);
 
 			mLandersColonist = 0;
 			mLandersCargo = 0;
@@ -717,7 +717,7 @@ void MapViewState::nextTurn()
 	updateResidentialCapacity();
 
 	// Colony will not have morale or crime effects until at least n turns from landing, depending on difficulty
-	bool isMoraleEnabled = mTurnCount > mTurnNumberOfLanding + gracePeriod[mDifficulty];
+	bool isMoraleEnabled = mTurnCount > mTurnNumberOfLanding + GracePeriod.at(mDifficulty);
 
 	if (isMoraleEnabled)
 	{