let context access definition manager

Author: DarkiBoi

src/openvic-simulation/scripts/Context.cpp

@@ -4,6 +4,7 @@
 #include "openvic-simulation/map/ProvinceInstance.hpp"
 #include "openvic-simulation/map/State.hpp"
 #include "openvic-simulation/population/Pop.hpp"
+#include "openvic-simulation/DefinitionManager.hpp"
 
 using namespace OpenVic;
 scope_type_t Context::get_scope_type() const {
@@ -78,7 +79,7 @@ bool Context::evaluate_leaf(ConditionNode const& node) const {
 				}
 				if (id == "badboy") {
 					fixed_point_t expected_ratio = std::get<fixed_point_t>(node.get_value());
-					return p->get_infamy_untracked() >= (expected_ratio * fixed_point_t(25));
+					return p->get_infamy_untracked() >= expected_ratio * definition_manager.get_define_manager().get_country_defines().get_infamy_containment_limit();
 				}
 				if (id == "civilized") {
 					bool expected = std::get<bool>(node.get_value());

src/openvic-simulation/scripts/Context.hpp

@@ -11,6 +11,7 @@ namespace OpenVic {
 	struct ProvinceInstance;
 	struct State;
 	struct Pop;
+	struct DefinitionManager;
 
 	struct Context {
 		std::variant<
@@ -19,19 +20,29 @@ namespace OpenVic {
 			State const*,
 			Pop const*> ptr;
 
+		DefinitionManager const& definition_manager;
+
 		Context const* this_scope = nullptr;
 		Context const* from_scope = nullptr;
 
-		Context(CountryInstance const* p) : ptr(p), this_scope(this) {}
-		Context(ProvinceInstance const* p) : ptr(p), this_scope(this) {}
-		Context(State const* p) : ptr(p), this_scope(this) {}
-		Context(Pop const* p) : ptr(p), this_scope(this) {}
+		Context(CountryInstance const* p, DefinitionManager const& dm)
+			: ptr(p), definition_manager(dm), this_scope(this) {}
+		Context(ProvinceInstance const* p, DefinitionManager const& dm)
+			: ptr(p), definition_manager(dm), this_scope(this) {}
+		Context(State const* p, DefinitionManager const& dm)
+			: ptr(p), definition_manager(dm), this_scope(this) {}
+		Context(Pop const* p, DefinitionManager const& dm)
+			: ptr(p), definition_manager(dm), this_scope(this) {}
 
 		Context(
 			auto* p,
+			DefinitionManager const& dm,
 			Context const* this_ctx,
 			Context const* from_ctx
-		) : ptr(p), this_scope(this_ctx), from_scope(from_ctx) {}
+		) : ptr(p),
+			definition_manager(dm),
+			this_scope(this_ctx),
+			from_scope(from_ctx) {}
 
 		scope_type_t get_scope_type() const;
 
@@ -44,7 +55,7 @@ namespace OpenVic {
 		std::optional<Context> get_redirect_context(std::string_view condition_id, scope_type_t target) const;
 
 		Context make_child(auto* p) const {
-			return Context(p, this->this_scope, this);
+			return Context(p, definition_manager, this->this_scope, this);
 		}
 	};
 }