Fleshing out Country, State and Province instances + historycountry-instance

2 files changed, 15 insertions, 2 deletions

diff --git a/src/openvic-simulation/military/UnitInstanceGroup.cpp b/src/openvic-simulation/military/UnitInstanceGroup.cpp
index 80ca3a9..07736f3 100644
--- a/src/openvic-simulation/military/UnitInstanceGroup.cpp
+++ b/src/openvic-simulation/military/UnitInstanceGroup.cpp
@@ -155,6 +155,17 @@ UnitInstanceGroupBranched<UnitType::branch_t::NAVAL>::UnitInstanceGroupBranched(
 	std::vector<ShipInstance*>&& new_units
 ) : UnitInstanceGroup { new_name, std::move(new_units) } {}
 
+
+fixed_point_t UnitInstanceGroupBranched<UnitType::branch_t::NAVAL>::get_total_consumed_supply() const {
+	fixed_point_t total_consumed_supply = 0;
+
+	for (ShipInstance const* ship : get_units()) {
+		total_consumed_supply += ship->get_unit_type().get_supply_consumption_score();
+	}
+
+	return total_consumed_supply;
+}
+
 template<UnitType::branch_t Branch>
 bool UnitInstanceManager::generate_unit_instance(
 	UnitDeployment<Branch> const& unit_deployment, UnitInstanceBranched<Branch>*& unit_instance
@@ -220,7 +231,7 @@ bool UnitInstanceManager::generate_unit_instance_group(
 	});
 
 	ret &= unit_instance_group.set_position(
-		map_instance.get_province_instance_from_const(unit_deployment_group.get_location())
+		&map_instance.get_province_instance_from_definition(*unit_deployment_group.get_location())
 	);
 	ret &= unit_instance_group.set_country(&country);
 
diff --git a/src/openvic-simulation/military/UnitInstanceGroup.hpp b/src/openvic-simulation/military/UnitInstanceGroup.hpp
index 4fe0cba..78ff289 100644
--- a/src/openvic-simulation/military/UnitInstanceGroup.hpp
+++ b/src/openvic-simulation/military/UnitInstanceGroup.hpp
@@ -90,7 +90,7 @@ namespace OpenVic {
 		friend struct UnitInstanceManager;
 
 	private:
-		std::vector<ArmyInstance const*> PROPERTY(carried_armies);
+		std::vector<ArmyInstance*> PROPERTY(carried_armies);
 
 		UnitInstanceGroupBranched(
 			std::string_view new_name,
@@ -99,6 +99,8 @@ namespace OpenVic {
 
 	public:
 		UnitInstanceGroupBranched(UnitInstanceGroupBranched&&) = default;
+
+		fixed_point_t get_total_consumed_supply() const;
 	};
 
 	using NavyInstance = UnitInstanceGroupBranched<UnitType::branch_t::NAVAL>;