Merge pull request #1886 from ineveraskedforthis/main

Fix bug related to new state creation, update dcon tag, add global keyword
schombert · Jan 30, 2025 · f6d8356 · f6d8356
2 parents c71e105 + eebe164
commit f6d8356
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 6 deletions.
diff --git a/dependencies/DataContainerGenerator/CMakeLists.txt b/dependencies/DataContainerGenerator/CMakeLists.txt
@@ -3,7 +3,7 @@ message(STATUS "Fetching DataContainer...")
 FetchContent_Declare(
 	DataContainer
 	GIT_REPOSITORY https://github.com/schombert/DataContainer
-	GIT_TAG f1ddfd3
+	GIT_TAG 538d55c
 	GIT_SHALLOW 1
 	GIT_PROGRESS TRUE
 )

diff --git a/src/gamestate/dcon_generated.txt b/src/gamestate/dcon_generated.txt
@@ -1,3 +1,5 @@
+global{no-conversions}
+
 include{<array>}
 include{"constants.hpp"}
 include{"modifiers.hpp"}

diff --git a/src/launcher/launcher_main.cpp b/src/launcher/launcher_main.cpp
@@ -36,7 +36,6 @@
 #include "gui_production_window.cpp"
 #include "gui_province_window.cpp"
 #include "gui_population_window.cpp"
-#include "gui_budget_window.cpp"
 #include "immediate_mode.cpp"
 #include "economy_viewer.cpp"
 #include "gui_technology_window.cpp"

diff --git a/src/provinces/province.cpp b/src/provinces/province.cpp
@@ -9,6 +9,7 @@
 #include "math_fns.hpp"
 #include "prng.hpp"
 #include "triggers.hpp"
+#include "economy_stats.hpp"
 #include <set>
 
 namespace province {
@@ -770,10 +771,27 @@ void change_province_owner(sys::state& state, dcon::province_id id, dcon::nation
 			auto new_market = state.world.create_market();
 
 			// set prices to something to avoid infinite demand:
-
-			state.world.for_each_commodity([&](auto cid){
-				state.world.market_set_price(new_market, cid, state.world.market_get_price(old_market, cid));
-			});
+			if(old_market) {
+				state.world.for_each_commodity([&](auto cid){
+					state.world.market_set_price(new_market, cid, state.world.market_get_price(old_market, cid));
+				});
+				for(auto index = 0; index < economy::labor::total; index++) {
+					state.world.market_set_labor_price(new_market, index, state.world.market_get_labor_price(old_market, index));
+				}
+				for(auto index = 0; index < economy::pop_labor::total; index++) {
+					state.world.market_set_pop_labor_distribution(new_market, index, state.world.market_get_pop_labor_distribution(old_market, index));
+				}
+			} else {
+				state.world.for_each_commodity([&](auto cid) {
+					state.world.market_set_price(new_market, cid, economy::median_price(state, cid));
+				});
+				for(auto index = 0; index < economy::labor::total; index++) {
+					state.world.market_set_labor_price(new_market, index, 1.f);
+				}
+				for(auto index = 0; index < economy::pop_labor::total; index++) {
+					state.world.market_set_pop_labor_distribution(new_market, index, 0.f);
+				}
+			}
 
 			auto new_local_market = state.world.force_create_local_market(new_market, new_si);