1 files changed, 55 insertions, 8 deletions

diff --git a/src/openvic-simulation/modifier/ModifierSum.hpp b/src/openvic-simulation/modifier/ModifierSum.hpp
index 957ffab..858ca71 100644
--- a/src/openvic-simulation/modifier/ModifierSum.hpp
+++ b/src/openvic-simulation/modifier/ModifierSum.hpp
@@ -1,30 +1,77 @@
 #pragma once
 
-#include "openvic-simulation/modifier/Modifier.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPointMap.hpp"
+#include <variant>
+
+#include "openvic-simulation/modifier/ModifierValue.hpp"
+#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 
 namespace OpenVic {
+	struct CountryInstance;
+	struct ProvinceInstance;
+	struct Modifier;
+
 	struct ModifierSum {
+		using modifier_source_t = std::variant<CountryInstance const*, ProvinceInstance const*>;
+
+		static std::string_view source_to_string(modifier_source_t const& source);
+
+		struct modifier_entry_t {
+			Modifier const* modifier;
+			fixed_point_t multiplier;
+			modifier_source_t source;
+			ModifierEffect::target_t excluded_targets;
+
+			constexpr modifier_entry_t(
+				Modifier const* new_modifier,
+				fixed_point_t new_multiplier,
+				modifier_source_t const& new_source,
+				ModifierEffect::target_t new_excluded_targets
+			) : modifier { new_modifier },
+				multiplier { new_multiplier },
+				source { new_source },
+				excluded_targets { new_excluded_targets } {}
+
+			constexpr bool operator==(modifier_entry_t const& other) const {
+				return modifier == other.modifier
+					&& multiplier == other.multiplier
+					&& source_to_string(source) == source_to_string(other.source)
+					&& excluded_targets == other.excluded_targets;
+			}
+
+			std::string to_string() const;
+		};
+
 	private:
-		fixed_point_map_t<Modifier const*> PROPERTY(modifiers);
+		std::vector<modifier_entry_t> PROPERTY(modifiers);
 		ModifierValue PROPERTY(value_sum);
 
 	public:
 		ModifierSum() = default;
+		ModifierSum(ModifierSum const&) = default;
 		ModifierSum(ModifierSum&&) = default;
+		ModifierSum& operator=(ModifierSum const&) = default;
+		ModifierSum& operator=(ModifierSum&&) = default;
 
 		void clear();
 		bool empty();
 
 		fixed_point_t get_effect(ModifierEffect const& effect, bool* effect_found = nullptr) const;
+		fixed_point_t get_effect_nullcheck(ModifierEffect const* effect, bool* effect_found = nullptr) const;
 		bool has_effect(ModifierEffect const& effect) const;
 
-		void add_modifier(Modifier const& modifier, fixed_point_t multiplier = fixed_point_t::_1());
+		void add_modifier(
+			Modifier const& modifier, modifier_source_t const& source, fixed_point_t multiplier = fixed_point_t::_1(),
+			ModifierEffect::target_t excluded_targets = ModifierEffect::target_t::ALL_TARGETS
+		);
+		void add_modifier_nullcheck(
+			Modifier const* modifier, modifier_source_t const& source, fixed_point_t multiplier = fixed_point_t::_1(),
+			ModifierEffect::target_t excluded_targets = ModifierEffect::target_t::ALL_TARGETS
+		);
 		void add_modifier_sum(ModifierSum const& modifier_sum);
+		void add_modifier_sum_exclude_targets(ModifierSum const& modifier_sum, ModifierEffect::target_t excluded_targets);
+		void add_modifier_sum_exclude_source(ModifierSum const& modifier_sum, modifier_source_t const& excluded_source);
 
-		ModifierSum& operator+=(Modifier const& modifier);
-		ModifierSum& operator+=(ModifierSum const& modifier_sum);
-
-		std::vector<std::pair<Modifier const*, fixed_point_t>> get_contributing_modifiers(ModifierEffect const& effect) const;
+		void push_contributing_modifiers(ModifierEffect const& effect, std::vector<modifier_entry_t>& contributions) const;
+		std::vector<modifier_entry_t> get_contributing_modifiers(ModifierEffect const& effect) const;
 	};
 }