Merge pull request #195 from OpenVicProject/ranking

Ranking System

2 files changed, 35 insertions, 1 deletions

diff --git a/src/openvic-simulation/misc/Define.cpp b/src/openvic-simulation/misc/Define.cpp
index 6161842..c28aab0 100644
--- a/src/openvic-simulation/misc/Define.cpp
+++ b/src/openvic-simulation/misc/Define.cpp
@@ -150,15 +150,25 @@ bool DefineManager::load_define_years(Timespan& value, Define::Type type, std::s
 DefineManager::DefineManager()
   : // Date
 	start_date { 1836, 1, 1 },
-	end_date { 1936, 1, 1 }
+	end_date { 1936, 1, 1 },
 
 	// Country
+	great_power_rank { 8 },
+	lose_great_power_grace_days { Timespan::from_years(1) },
+	secondary_power_rank { 16 },
+	country_investment_industrial_score_factor { 1 },
 
 	// Economy
 
 	// Military
+	pop_size_per_regiment { 1000 },
+	min_pop_size_for_regiment { 1000 },
+	pop_size_per_regiment_protectorate_multiplier { 1 },
+	pop_size_per_regiment_colony_multiplier { 1 },
+	pop_size_per_regiment_non_core_multiplier { 1 },
 
 	// Diplomacy
+	disarmed_penalty { 0 }
 
 	// Pops
 
@@ -231,12 +241,24 @@ bool DefineManager::load_defines_file(ast::NodeCPtr root) {
 	ret &= load_define(end_date, Date, "end_date");
 
 	// Country
+	ret &= load_define(great_power_rank, Country, "GREAT_NATIONS_COUNT");
+	ret &= load_define_days(lose_great_power_grace_days, Country, "GREATNESS_DAYS");
+	ret &= load_define(secondary_power_rank, Country, "COLONIAL_RANK");
+	ret &= load_define(country_investment_industrial_score_factor, Country, "INVESTMENT_SCORE_FACTOR");
 
 	// Economy
 
 	// Military
+	ret &= load_define(pop_size_per_regiment, Military, "POP_SIZE_PER_REGIMENT");
+	ret &= load_define(min_pop_size_for_regiment, Military, "POP_MIN_SIZE_FOR_REGIMENT");
+	ret &= load_define(
+		pop_size_per_regiment_protectorate_multiplier, Military, "POP_MIN_SIZE_FOR_REGIMENT_PROTECTORATE_MULTIPLIER"
+	);
+	ret &= load_define(pop_size_per_regiment_colony_multiplier, Military, "POP_MIN_SIZE_FOR_REGIMENT_COLONY_MULTIPLIER");
+	ret &= load_define(pop_size_per_regiment_non_core_multiplier, Military, "POP_MIN_SIZE_FOR_REGIMENT_NONCORE_MULTIPLIER");
 
 	// Diplomacy
+	ret &= load_define(disarmed_penalty, Diplomacy, "DISARMAMENT_ARMY_HIT");
 
 	// Pops
 
diff --git a/src/openvic-simulation/misc/Define.hpp b/src/openvic-simulation/misc/Define.hpp
index 7d8fbf7..064883c 100644
--- a/src/openvic-simulation/misc/Define.hpp
+++ b/src/openvic-simulation/misc/Define.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "openvic-simulation/pop/Pop.hpp"
 #include "openvic-simulation/types/IdentifierRegistry.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 
@@ -41,12 +42,23 @@ namespace OpenVic {
 		Date PROPERTY(end_date); // end_date
 
 		// Country
+		size_t PROPERTY(great_power_rank); // GREAT_NATIONS_COUNT
+		Timespan PROPERTY(lose_great_power_grace_days); // GREATNESS_DAYS
+		size_t PROPERTY(secondary_power_rank); // COLONIAL_RANK
+		fixed_point_t PROPERTY(country_investment_industrial_score_factor); // INVESTMENT_SCORE_FACTOR
 
 		// Economy
 
 		// Military
+		Pop::pop_size_t PROPERTY(pop_size_per_regiment); // POP_SIZE_PER_REGIMENT
+		Pop::pop_size_t PROPERTY(min_pop_size_for_regiment); // POP_MIN_SIZE_FOR_REGIMENT
+		// POP_MIN_SIZE_FOR_REGIMENT_PROTECTORATE_MULTIPLIER
+		fixed_point_t PROPERTY(pop_size_per_regiment_protectorate_multiplier);
+		fixed_point_t PROPERTY(pop_size_per_regiment_colony_multiplier); // POP_MIN_SIZE_FOR_REGIMENT_COLONY_MULTIPLIER
+		fixed_point_t PROPERTY(pop_size_per_regiment_non_core_multiplier); // POP_MIN_SIZE_FOR_REGIMENT_NONCORE_MULTIPLIER
 
 		// Diplomacy
+		fixed_point_t PROPERTY(disarmed_penalty); // DISARMAMENT_ARMY_HIT
 
 		// Pops