implement exists properly

Author: DarkiBoi

src/openvic-simulation/scripts/Context.cpp

@@ -5,6 +5,7 @@
 #include "openvic-simulation/map/State.hpp"
 #include "openvic-simulation/population/Pop.hpp"
 #include "openvic-simulation/DefinitionManager.hpp"
+#include "openvic-simulation/InstanceManager.hpp"
 
 using namespace OpenVic;
 scope_type_t Context::get_scope_type() const {
@@ -97,8 +98,15 @@ bool Context::evaluate_leaf(ConditionNode const& node) const {
 					return has_colonies == expected;
 				}
 				if (id == "exists") {
-					bool expected = std::get<bool>(node.get_value());
-					return p->exists() == expected;
+					auto const& value = node.get_value();
+					if (auto const* expected = std::get_if<bool>(&value)) {
+						return p->exists() == *expected;
+					}
+					if (auto const* tag = std::get_if<memory::string>(&value)) {
+						CountryInstance const* country_instance = instance_manager.get_country_instance_manager().get_country_instance_by_identifier(*tag);
+						return country_instance != nullptr && country_instance->exists();
+					}
+					return false;
 				}
 				if (id == "industrial_score") {
 					fixed_point_t expected = std::get<fixed_point_t>(node.get_value());

src/openvic-simulation/scripts/Context.hpp

@@ -12,6 +12,7 @@ namespace OpenVic {
 	struct State;
 	struct Pop;
 	struct DefinitionManager;
+	struct InstanceManager;
 
 	struct Context {
 		std::variant<
@@ -21,26 +22,29 @@ namespace OpenVic {
 			Pop const*> ptr;
 
 		DefinitionManager const& definition_manager;
+		InstanceManager const& instance_manager;
 
 		Context const* this_scope = nullptr;
 		Context const* from_scope = nullptr;
 
-		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(CountryInstance const* p, DefinitionManager const& dm, InstanceManager const& im)
+			: ptr(p), definition_manager(dm), instance_manager(im), this_scope(this) {}
+		Context(ProvinceInstance const* p, DefinitionManager const& dm, InstanceManager const& im)
+			: ptr(p), definition_manager(dm), instance_manager(im), this_scope(this) {}
+		Context(State const* p, DefinitionManager const& dm, InstanceManager const& im)
+			: ptr(p), definition_manager(dm), instance_manager(im), this_scope(this) {}
+		Context(Pop const* p, DefinitionManager const& dm, InstanceManager const& im)
+			: ptr(p), definition_manager(dm), instance_manager(im), this_scope(this) {}
 
 		Context(
 			auto* p,
 			DefinitionManager const& dm,
+			InstanceManager const& im,
 			Context const* this_ctx,
 			Context const* from_ctx
 		) : ptr(p),
 			definition_manager(dm),
+			instance_manager(im),
 			this_scope(this_ctx),
 			from_scope(from_ctx) {}
 
@@ -55,7 +59,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, definition_manager, this->this_scope, this);
+			return Context(p, definition_manager, instance_manager, this->this_scope, this);
 		}
 	};
 }