fix supply tooltip bug

ineveraskedforthis · Jan 23, 2025 · 1911bac · 1911bac
1 parent 249a7a1
commit 1911bac
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/src/economy/economy_government.cpp b/src/economy/economy_government.cpp
@@ -74,6 +74,16 @@ float tax_collection_capacity(sys::state& state, dcon::nation_id n, dcon::state_
 		* tax_collection_multiplier;
 }
 
+float total_tax_collection_capacity(sys::state& state, dcon::nation_id n) {
+	auto total = 0.f;
+	state.world.nation_for_each_state_ownership(n, [&](auto soid) {
+		auto local_state = state.world.state_ownership_get_state(soid);
+		auto local_market = state.world.state_instance_get_market_from_local_market(local_state);
+		total += tax_collection_capacity(state, n, local_state);
+	});
+	return total;
+}
+
 float global_admin_ratio(sys::state& state, dcon::nation_id n) {
 	auto capital = state.world.nation_get_capital(n);
 	auto capital_state = state.world.province_get_state_membership(capital);

diff --git a/src/economy/economy_government.hpp b/src/economy/economy_government.hpp
@@ -10,6 +10,8 @@ namespace economy {
 
 // amount of taxes you can collect in a given region
 float tax_collection_capacity(sys::state& state, dcon::nation_id n, dcon::state_instance_id sid);
+// amount of taxes you can collect in a given region summed up for each region
+float total_tax_collection_capacity(sys::state& state, dcon::nation_id n);
 // ratio of current employed imperial admin to imperial admin required by your nation
 float global_admin_ratio(sys::state& state, dcon::nation_id n);
 // ratio of current employed local admin to local admin required by given state instance

diff --git a/src/gui/gui_unit_panel.hpp b/src/gui/gui_unit_panel.hpp
@@ -1512,7 +1512,7 @@ class unit_supply_bar : public progress_bar {
 				break;
 			}
 
-			dcon::commodity_id c{ dcon::commodity_id::value_base_t(i) };
+			dcon::commodity_id c = commodities.commodity_type[i];
 
 			auto satisfaction = state.world.market_get_demand_satisfaction(m, c);
 			auto val = commodities.commodity_type[i];
@@ -1560,7 +1560,7 @@ class unit_supply_bar : public progress_bar {
 			if(!commodities.commodity_type[i]) {
 				break;
 			}
-			dcon::commodity_id c{ dcon::commodity_id::value_base_t(i) };
+			dcon::commodity_id c = commodities.commodity_type[i];
 
 			auto satisfaction = state.world.market_get_demand_satisfaction(m, c);
 			auto val = commodities.commodity_type[i];
@@ -1574,7 +1574,7 @@ class unit_supply_bar : public progress_bar {
 		text::add_line_break_to_layout(state, contents);
 		for(uint32_t i = 0; i < economy::commodity_set::set_size; ++i) {
 			if(commodities.commodity_type[i] && commodities.commodity_amounts[i] > 0) {
-				dcon::commodity_id c{ dcon::commodity_id::value_base_t(i) };
+				dcon::commodity_id c = commodities.commodity_type[i];
 				float satisfaction = state.world.market_get_demand_satisfaction(m, c);
 				float wanted_commodity = commodities.commodity_amounts[i];
 				float actual_commodity = commodities.commodity_amounts[i] * satisfaction * nations_commodity_spending * spending_level;