Merge pull request #360 from OpenVicProject/implement_taxation

wvpm · web-flow · commit f8f506b95dd0 · 2025-02-28T21:26:17.000+01:00
Implement taxation
diff --git a/src/openvic-simulation/InstanceManager.cpp b/src/openvic-simulation/InstanceManager.cpp
@@ -231,14 +231,13 @@ bool InstanceManager::load_bookmark(Bookmark const* new_bookmark) {
 		definition_manager.get_politics_manager().get_ideology_manager().get_ideologies()
 	);
 
-	if (ret) {
-		update_modifier_sums();
-		map_instance.initialise_for_new_game(
-			today,
-			definition_manager.get_define_manager()
-		);
-		market_instance.execute_orders();
-	}
+	update_modifier_sums();
+	country_instance_manager.update_gamestate(*this);
+	map_instance.initialise_for_new_game(
+		today,
+		definition_manager.get_define_manager()
+	);
+	market_instance.execute_orders();
 
 	return ret;
 }
diff --git a/src/openvic-simulation/country/CountryInstance.cpp b/src/openvic-simulation/country/CountryInstance.cpp
@@ -56,6 +56,7 @@ CountryInstance::CountryInstance(
 	building_type_unlock_levels { &building_type_keys },
 
 	/* Budget */
+	taxable_income_mutex { std::make_unique<std::mutex>() },
 	taxable_income_by_pop_type { &pop_type_keys },
 	effective_tax_rate_by_strata { &strata_keys },
 	tax_rate_slider_value_by_strata { &strata_keys },
@@ -1485,6 +1486,8 @@ void CountryInstance::country_reset_before_tick() {
 	for (auto pair : goods_data) {
 		pair.second.clear_daily_recorded_data();
 	}
+	
+	taxable_income_by_pop_type.fill(fixed_point_t::_0());
 }
 
 void CountryInstance::country_tick(InstanceManager& instance_manager) {
@@ -1547,16 +1550,17 @@ void CountryInstance::country_tick(InstanceManager& instance_manager) {
 			total_gold_production += produced_quantity;
 		}
 	}
+
 	gold_income = country_defines.get_gold_to_cash_rate() * total_gold_production;
 	cash_stockpile += gold_income;
 }
 
 CountryInstance::good_data_t::good_data_t()
-	: lock { std::make_unique<std::mutex>() }
+	: mutex { std::make_unique<std::mutex>() }
 	{ }
 
 void CountryInstance::good_data_t::clear_daily_recorded_data() {
-	const std::lock_guard<std::mutex> lock_guard { *lock };
+	const std::lock_guard<std::mutex> lock_guard { *mutex };
 	stockpile_change_yesterday
 		= exported_amount
 		= government_needs
@@ -1572,19 +1576,25 @@ void CountryInstance::good_data_t::clear_daily_recorded_data() {
 	production_per_production_type.clear();
 }
 
+void CountryInstance::report_pop_income_tax(PopType const& pop_type, const fixed_point_t gross_income, const fixed_point_t paid_as_tax) {
+	const std::lock_guard<std::mutex> lock_guard { *taxable_income_mutex };
+	taxable_income_by_pop_type[pop_type] += gross_income;
+	cash_stockpile += paid_as_tax;
+}
+
 void CountryInstance::report_pop_need_consumption(PopType const& pop_type, GoodDefinition const& good, const fixed_point_t quantity) {
 	good_data_t& good_data = get_good_data(good);
-	const std::lock_guard<std::mutex> lock_guard { *good_data.lock };
+	const std::lock_guard<std::mutex> lock_guard { *good_data.mutex };
 	good_data.need_consumption_per_pop_type[&pop_type] += quantity;
 }
 void CountryInstance::report_pop_need_demand(PopType const& pop_type, GoodDefinition const& good, const fixed_point_t quantity) {
 	good_data_t& good_data = get_good_data(good);
-	const std::lock_guard<std::mutex> lock_guard { *good_data.lock };
+	const std::lock_guard<std::mutex> lock_guard { *good_data.mutex };
 	good_data.pop_demand += quantity;
 }
 void CountryInstance::report_input_consumption(ProductionType const& production_type, GoodDefinition const& good, const fixed_point_t quantity) {
 	good_data_t& good_data = get_good_data(good);
-	const std::lock_guard<std::mutex> lock_guard { *good_data.lock };
+	const std::lock_guard<std::mutex> lock_guard { *good_data.mutex };
 	good_data.input_consumption_per_production_type[&production_type] += quantity;
 }
 void CountryInstance::report_input_demand(ProductionType const& production_type, GoodDefinition const& good, const fixed_point_t quantity) {
@@ -1593,7 +1603,7 @@ void CountryInstance::report_input_demand(ProductionType const& production_type,
 			case demand_category::FactoryNeeds: break;
 			case demand_category::PopNeeds: {
 				good_data_t& good_data = get_good_data(good);
-				const std::lock_guard<std::mutex> lock_guard { *good_data.lock };
+				const std::lock_guard<std::mutex> lock_guard { *good_data.mutex };
 				good_data.pop_demand += quantity;
 				return;
 			}
@@ -1602,12 +1612,12 @@ void CountryInstance::report_input_demand(ProductionType const& production_type,
 	}
 
 	good_data_t& good_data = get_good_data(good);
-	const std::lock_guard<std::mutex> lock_guard { *good_data.lock };
+	const std::lock_guard<std::mutex> lock_guard { *good_data.mutex };
 	good_data.factory_demand += quantity;
 }
 void CountryInstance::report_output(ProductionType const& production_type, const fixed_point_t quantity) {
 	good_data_t& good_data = get_good_data(production_type.get_output_good());
-	const std::lock_guard<std::mutex> lock_guard { *good_data.lock };
+	const std::lock_guard<std::mutex> lock_guard { *good_data.mutex };
 	good_data.production_per_production_type[&production_type] += quantity;
 }
 
diff --git a/src/openvic-simulation/country/CountryInstance.hpp b/src/openvic-simulation/country/CountryInstance.hpp
@@ -8,6 +8,7 @@
 #include "openvic-simulation/politics/Rule.hpp"
 #include "openvic-simulation/pop/PopType.hpp"
 #include "openvic-simulation/types/Date.hpp"
+#include "openvic-simulation/types/fixed_point/Atomic.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/types/FlagStrings.hpp"
 #include "openvic-simulation/types/IdentifierRegistry.hpp"
@@ -124,7 +125,8 @@ namespace OpenVic {
 		// TODO - total amount of each good produced
 
 		/* Budget */
-		fixed_point_t PROPERTY(cash_stockpile);
+		moveable_atomic_fixed_point_t PROPERTY(cash_stockpile);
+		std::unique_ptr<std::mutex> taxable_income_mutex;
 		fixed_point_t PROPERTY(gold_income);
 		IndexedMap<PopType, fixed_point_t> PROPERTY(taxable_income_by_pop_type);
 		IndexedMap<Strata, fixed_point_t> PROPERTY(effective_tax_rate_by_strata);
@@ -200,7 +202,7 @@ namespace OpenVic {
 		/* Trade */
 	public:
 		struct good_data_t {
-			std::unique_ptr<std::mutex> lock;
+			std::unique_ptr<std::mutex> mutex;
 			fixed_point_t stockpile_amount;
 			fixed_point_t stockpile_change_yesterday; // positive if we bought, negative if we sold
 
@@ -543,6 +545,7 @@ namespace OpenVic {
 		good_data_t const& get_good_data(GoodDefinition const& good_definition) const;
 
 		//thread safe
+		void report_pop_income_tax(PopType const& pop_type, const fixed_point_t gross_income, const fixed_point_t paid_as_tax);
 		void report_pop_need_consumption(PopType const& pop_type, GoodDefinition const& good, const fixed_point_t quantity);
 		void report_pop_need_demand(PopType const& pop_type, GoodDefinition const& good, const fixed_point_t quantity);
 		void report_input_consumption(ProductionType const& production_type, GoodDefinition const& good, const fixed_point_t quantity);
diff --git a/src/openvic-simulation/map/ProvinceInstance.hpp b/src/openvic-simulation/map/ProvinceInstance.hpp
@@ -136,6 +136,10 @@ namespace OpenVic {
 			return province_definition;
 		}
 
+		constexpr CountryInstance const* get_country_to_report_economy() const {
+			return controller;
+		}
+
 		constexpr CountryInstance* get_country_to_report_economy() {
 			return controller;
 		}
diff --git a/src/openvic-simulation/pop/Pop.cpp b/src/openvic-simulation/pop/Pop.cpp
@@ -240,8 +240,19 @@ void Pop::fill_needs_fulfilled_goods_with_false() {
 	#undef FILL_WITH_FALSE
 }
 
+void Pop::pay_income_tax(fixed_point_t& income) {
+	CountryInstance* const tax_collector_nullable = location->get_country_to_report_economy();
+	if (tax_collector_nullable == nullptr) {
+		return;
+	}
+	const fixed_point_t effective_tax_rate = tax_collector_nullable->get_effective_tax_rate_by_strata()[type->get_strata()];
+	const fixed_point_t tax = effective_tax_rate * income;
+	tax_collector_nullable->report_pop_income_tax(*type, income, tax);
+	income -= tax;
+}
+
 #define DEFINE_ADD_INCOME_FUNCTIONS(name) \
-	void Pop::add_##name(const fixed_point_t amount){ \
+	void Pop::add_##name(fixed_point_t amount){ \
 		if (OV_unlikely(amount == fixed_point_t::_0())) { \
 			Logger::warning("Adding ", #name, " of 0 to pop. Context", get_pop_context_text().str()); \
 			return; \
@@ -250,6 +261,7 @@ void Pop::fill_needs_fulfilled_goods_with_false() {
 			Logger::error("Adding negative ", #name, " of ", amount, " to pop. Context", get_pop_context_text().str()); \
 			return; \
 		} \
+		pay_income_tax(amount); \
 		name += amount; \
 		income += amount; \
 		cash += amount; \
diff --git a/src/openvic-simulation/pop/Pop.hpp b/src/openvic-simulation/pop/Pop.hpp
@@ -65,7 +65,7 @@ namespace OpenVic {
 		fixed_point_t PROPERTY(money_type);
 
 	#define DECLARE_POP_MONEY_STORE_FUNCTIONS(name) \
-		void add_##name(const fixed_point_t amount);
+		void add_##name(fixed_point_t amount);
 
 	/* REQUIREMENTS:
 	 * POP-18, POP-19, POP-20, POP-21, POP-34, POP-35, POP-36, POP-37
@@ -153,6 +153,7 @@ namespace OpenVic {
 			fixed_point_t& cash_left_to_spend
 		);
 		void pop_tick_without_cleanup(PopValuesFromProvince& shared_values);
+		void pay_income_tax(fixed_point_t& income);
 		static void after_buy(void* actor, BuyResult const& buy_result);
 		static void after_sell(void* actor, SellResult const& sell_result);
 
diff --git a/src/openvic-simulation/pop/PopValuesFromProvince.cpp b/src/openvic-simulation/pop/PopValuesFromProvince.cpp
@@ -4,6 +4,7 @@
 #include "openvic-simulation/defines/PopsDefines.hpp"
 #include "openvic-simulation/modifier/ModifierEffectCache.hpp"
 #include "openvic-simulation/map/ProvinceInstance.hpp"
+#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 
 using namespace OpenVic;
 
diff --git a/src/openvic-simulation/pop/PopValuesFromProvince.hpp b/src/openvic-simulation/pop/PopValuesFromProvince.hpp
@@ -5,6 +5,7 @@
 
 #include "openvic-simulation/types/IndexedMap.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
+#include "openvic-simulation/types/fixed_point/FixedPointMap.hpp"
 #include "openvic-simulation/utility/Getters.hpp"
 
 namespace OpenVic {
@@ -20,7 +21,11 @@ namespace OpenVic {
 		fixed_point_t PROPERTY(shared_everyday_needs_scalar);
 		fixed_point_t PROPERTY(shared_luxury_needs_scalar);
 	public:
-		void update_pop_strata_values_from_province(PopsDefines const& defines, Strata const& strata, ProvinceInstance const& province);
+		void update_pop_strata_values_from_province(
+			PopsDefines const& defines,
+			Strata const& strata,
+			ProvinceInstance const& province
+		);
 	};
 
 	struct PopValuesFromProvince {

Original file line number	Diff line number	Diff line change
`@@ -136,6 +136,10 @@ namespace OpenVic {`
`136`	`136`	`return province_definition;`
`137`	`137`	`}`
`138`	`138`
	`139`	`+ constexpr CountryInstance const* get_country_to_report_economy() const {`
	`140`	`+ return controller;`
	`141`	`+ }`
	`142`	`+`
`139`	`143`	`constexpr CountryInstance* get_country_to_report_economy() {`
`140`	`144`	`return controller;`
`141`	`145`	`}`