Merge pull request #1499 from OutpostUniverse/refactorCrimeEvents

Add `Signal` for `CrimeExecution` events

Author: DanRStevens

OPHD/States/CrimeExecution.cpp

@@ -47,13 +47,18 @@ namespace
 }
 
 
-CrimeExecution::CrimeExecution(NotificationArea& notificationArea, const Difficulty& difficulty) :
-	mDifficulty{difficulty},
-	mNotificationArea{notificationArea}
+CrimeExecution::CrimeExecution(const Difficulty& difficulty) :
+	mDifficulty{difficulty}
 {
 }
 
 
+CrimeExecution::CrimeExecution(const Difficulty& difficulty, Signal::DelegateType onCrimeEvent) : CrimeExecution{difficulty}
+{
+	mCrimeEventSignal.connect(onCrimeEvent);
+}
+
+
 void CrimeExecution::executeCrimes(const std::vector<Structure*>& structuresCommittingCrime)
 {
 	mMoraleChanges.clear();
@@ -88,13 +93,11 @@ void CrimeExecution::stealFood(FoodProduction& structure)
 		int foodStolen = calcAmountForStealing(mDifficulty, 5, 15, structure.foodLevel());
 		structure.foodLevel(structure.foodLevel() - foodStolen);
 
-		const auto& structureTile = NAS2D::Utility<StructureManager>::get().tileFromStructure(&structure);
-
-		mNotificationArea.push({
+		mCrimeEventSignal.emit(
 			"Food Stolen",
 			NAS2D::stringFrom(foodStolen) + " units of food was pilfered from a " + structure.name() + ". " + getReasonForStealing() + ".",
-			structureTile.xyz(),
-			NotificationArea::NotificationType::Warning});
+			structure
+		);
 	}
 }
 
@@ -125,25 +128,21 @@ void CrimeExecution::stealResources(Structure& structure, const std::array<std::
 	int amountStolen = calcAmountForStealing(mDifficulty, 2, 5, structure.storage().resources[indexToStealFrom]);
 	structure.storage().resources[indexToStealFrom] -= amountStolen;
 
-	const auto& structureTile = NAS2D::Utility<StructureManager>::get().tileFromStructure(&structure);
-
-	mNotificationArea.push({
+	mCrimeEventSignal.emit(
 		"Resources Stolen",
 		NAS2D::stringFrom(amountStolen) + " units of " + resourceNames[indexToStealFrom] + " were stolen from a " + structure.name() + ". " + getReasonForStealing() + ".",
-		structureTile.xyz(),
-		NotificationArea::NotificationType::Warning});
+		structure
+	);
 }
 
 
 void CrimeExecution::vandalize(Structure& structure)
 {
 	mMoraleChanges.push_back(std::make_pair("Vandalism", -1));
 
-	const auto& structureTile = NAS2D::Utility<StructureManager>::get().tileFromStructure(&structure);
-
-	mNotificationArea.push({
+	mCrimeEventSignal.emit(
 		"Vandalism",
 		"A " + structure.name() + " was vandalized.",
-		structureTile.xyz(),
-		NotificationArea::NotificationType::Warning});
+		structure
+	);
 }

OPHD/States/CrimeExecution.h

@@ -3,6 +3,8 @@
 #include "../MapObjects/Structures/FoodProduction.h"
 #include "../Common.h"
 
+#include <NAS2D/Signal/Signal.h>
+
 #include <vector>
 #include <array>
 #include <map>
@@ -16,21 +18,24 @@ class NotificationArea;
 class CrimeExecution
 {
 public:
-	CrimeExecution(NotificationArea& notificationArea, const Difficulty& difficulty);
+	using Signal = NAS2D::Signal<std::string, std::string, const Structure&>;
+
+	CrimeExecution(const Difficulty& difficulty);
+	CrimeExecution(const Difficulty& difficulty, Signal::DelegateType onCrimeEvent);
 
 	void executeCrimes(const std::vector<Structure*>& structuresCommittingCrime);
+	std::vector<std::pair<std::string, int>> moraleChanges() const { return mMoraleChanges; }
+	Signal::Source& crimeEventSignal() { return mCrimeEventSignal; }
 
+protected:
 	void stealFood(FoodProduction& structure);
 	void stealRefinedResources(Structure& structure);
 	void stealRawResources(Structure& structure);
+	void stealResources(Structure& structure, const std::array<std::string, 4>& resourceNames);
 	void vandalize(Structure& structure);
 
-	std::vector<std::pair<std::string, int>> moraleChanges() const { return mMoraleChanges; }
-
 private:
 	const Difficulty& mDifficulty;
-	NotificationArea& mNotificationArea;
 	std::vector<std::pair<std::string, int>> mMoraleChanges;
-
-	void stealResources(Structure& structure, const std::array<std::string, 4>& resourceNames);
+	Signal mCrimeEventSignal;
 };

OPHD/States/MapViewState.cpp

@@ -177,7 +177,7 @@ const std::map<Difficulty, int> MapViewState::ColonyShipDeorbitMoraleLossMultipl
 
 MapViewState::MapViewState(MainReportsUiState& mainReportsState, const std::string& savegame) :
 	mCrimeRateUpdate{mDifficulty},
-	mCrimeExecution{mNotificationArea, mDifficulty},
+	mCrimeExecution{mDifficulty, {this, &MapViewState::onCrimeEvent}},
 	mTechnologyReader{"tech0-1.xml"},
 	mLoadingExisting{true},
 	mExistingToLoad{savegame},
@@ -198,7 +198,7 @@ MapViewState::MapViewState(MainReportsUiState& mainReportsState, const Planet::A
 	mDifficulty{selectedDifficulty},
 	mTileMap{std::make_unique<TileMap>(planetAttributes.mapImagePath, planetAttributes.maxDepth, planetAttributes.maxMines, HostilityMineYields.at(planetAttributes.hostility))},
 	mCrimeRateUpdate{mDifficulty},
-	mCrimeExecution{mNotificationArea, mDifficulty},
+	mCrimeExecution{mDifficulty, {this, &MapViewState::onCrimeEvent}},
 	mTechnologyReader{"tech0-1.xml"},
 	mPlanetAttributes{planetAttributes},
 	mMainReportsState{mainReportsState},

OPHD/States/MapViewState.h

@@ -205,6 +205,8 @@ class MapViewState : public Wrapper
 
 	void onMineFacilityExtend(MineFacility* mf);
 
+	void onCrimeEvent(std::string title, std::string text, const Structure& structure);
+
 	void updatePlayerResources();
 	void updateResearch();
 

OPHD/States/MapViewStateEvent.cpp

@@ -251,3 +251,16 @@ void MapViewState::onMineFacilityExtend(MineFacility* mineFacility)
 	mineDepthTile.index(TerrainType::Dozed);
 	mineDepthTile.excavated(true);
 }
+
+
+void MapViewState::onCrimeEvent(std::string title, std::string text, const Structure& structure)
+{
+	const auto& structureTile = NAS2D::Utility<StructureManager>::get().tileFromStructure(&structure);
+
+	mNotificationArea.push({
+		std::move(title),
+		std::move(text),
+		structureTile.xyz(),
+		NotificationArea::NotificationType::Warning
+	});
+}