Merge pull request #469 from OpenVicProject/add/pathfinding-unit-enter-check

Add ArmyAStarPathing for ArmyInstance pathing

Author: Spartan322

src/openvic-simulation/map/MapInstance.cpp

@@ -13,7 +13,7 @@ MapInstance::MapInstance(
 	ThreadPool& new_thread_pool
 ) : map_definition { new_map_definition },
 	thread_pool { new_thread_pool },
-	land_pathing { map_definition.get_path_map_land() },
+	land_pathing { *this },
 	sea_pathing { map_definition.get_path_map_sea() } {}
 
 ProvinceInstance& MapInstance::get_province_instance_from_definition(ProvinceDefinition const& province) {

src/openvic-simulation/map/MapInstance.hpp

@@ -35,7 +35,7 @@ namespace OpenVic {
 		// TODO - should this be a vector of bools which we resize to the largest enabled canal index?
 		ordered_set<canal_index_t> PROPERTY(enabled_canals);
 
-		AStarPathing PROPERTY_REF(land_pathing);
+		ArmyAStarPathing PROPERTY_REF(land_pathing);
 		AStarPathing PROPERTY_REF(sea_pathing);
 
 	public:

src/openvic-simulation/military/UnitInstanceGroup.hpp

@@ -99,6 +99,8 @@ namespace OpenVic {
 		NavyInstance* PROPERTY_PTR(transport_navy, nullptr);
 		dig_in_level_t PROPERTY(dig_in_level, 0);
 
+		bool PROPERTY_RW_CUSTOM_NAME(exiled, is_exiled, set_is_exiled, false);
+
 		UnitInstanceGroupBranched(
 			unique_id_t new_unique_id,
 			std::string_view new_name

src/openvic-simulation/pathfinding/AStarPathing.cpp

@@ -8,8 +8,14 @@
 #include <range/v3/algorithm/find.hpp>
 #include <range/v3/algorithm/heap_algorithm.hpp>
 
+#include "openvic-simulation/country/CountryInstance.hpp"
+#include "openvic-simulation/map/MapDefinition.hpp"
+#include "openvic-simulation/map/MapInstance.hpp"
+#include "openvic-simulation/map/ProvinceInstance.hpp"
+#include "openvic-simulation/military/UnitInstanceGroup.hpp"
 #include "openvic-simulation/pathfinding/PointMap.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
+#include "openvic-simulation/utility/Utility.hpp"
 
 using namespace OpenVic;
 
@@ -91,3 +97,34 @@ bool AStarPathing::_solve(search_iterator begin_point, search_iterator end_point
 
 	return found_route;
 }
+
+ArmyAStarPathing::ArmyAStarPathing(MapInstance const& map)
+	: map_instance(map), AStarPathing(&map.get_map_definition().get_path_map_land()) {}
+
+bool ArmyAStarPathing::_is_point_enabled(search_const_iterator it) const {
+	if (!AStarPathing::_is_point_enabled(it)) {
+		return false;
+	}
+
+	if (OV_unlikely(army_instance == nullptr)) {
+		return true;
+	}
+
+	if (army_instance->is_exiled()) {
+		return true;
+	}
+
+	ProvinceInstance const* province = map_instance.get_province_instance_by_index(it->first);
+
+	if (OV_unlikely(province == nullptr)) {
+		return true;
+	}
+
+	CountryInstance const* province_owner = province->get_owner();
+
+	if (OV_unlikely(province_owner == nullptr)) {
+		return true;
+	}
+
+	return army_instance->get_country()->can_units_enter(*province_owner);
+}

src/openvic-simulation/pathfinding/AStarPathing.hpp

@@ -5,10 +5,15 @@
 #include <tsl/ordered_map.h>
 #include <tsl/ordered_set.h>
 
+#include "openvic-simulation/military/UnitType.hpp"
 #include "openvic-simulation/pathfinding/PathingBase.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 
 namespace OpenVic {
+	struct MapInstance;
+	template<UnitType::branch_t>
+	struct UnitInstanceGroupBranched;
+
 	struct AStarPathingNode final : public PathingNodeBase<AStarPathingNode> {
 		using PathingNodeBase::PathingNodeBase;
 
@@ -49,4 +54,14 @@ namespace OpenVic {
 			search_iterator begin_point, search_iterator end_point, uint64_t pass, bool allow_partial_path
 		) override;
 	};
+
+	struct ArmyAStarPathing final : public AStarPathing {
+		ArmyAStarPathing(MapInstance const& map);
+
+	protected:
+		UnitInstanceGroupBranched<UnitType::branch_t::LAND> const* PROPERTY_RW_ACCESS(army_instance, protected, nullptr);
+		MapInstance const& PROPERTY(map_instance);
+
+		virtual bool _is_point_enabled(search_const_iterator it) const override;
+	};
 }