prevent a few edge cases

Author: ineveraskedforthis

src/economy/economy.cpp

@@ -2926,7 +2926,7 @@ void daily_update(sys::state& state, bool presimulation, float presimulation_sta
 			);
 			change = ve::select(
 				change * current_volume > 0.f, // change and volume are collinear
-				change * ve::max(0.2f, (bought - 0.5f) * 2.f),
+				change * ve::max(0.01f, (bought - 0.5f) * 2.f),
 				change
 			);
 
@@ -3577,7 +3577,7 @@ void daily_update(sys::state& state, bool presimulation, float presimulation_sta
 			// so they don't want spoiled goods to cost too much
 			// so naturally, they don't stockpile expensive goods as much:
 			auto stockpiles = state.world.market_get_stockpile(ids, c);
-			auto stockpile_target_merchants = ve::max(0.f, ve_market_speculation_budget(state, ids, c)) / (ve_price(state, ids, c) + 1.f);
+			auto stockpile_target_merchants = ve_stockpile_target_speculation(state, ids, c);
 
 			// when good is expensive, we want to emulate competition between merhants to sell or buy it:
 			// wage rating: earnings of population unit during the day
@@ -4120,9 +4120,9 @@ void daily_update(sys::state& state, bool presimulation, float presimulation_sta
 				auto states = state.world.market_get_zone_from_local_market(markets);
 				auto capitals = state.world.state_instance_get_capital(states);
 				auto price = ve_price(state, markets, c);
-				auto stockpile_target_merchants = ve_market_speculation_budget(state, markets, c) / (price + 1.f);
+				auto stockpile_target_merchants = ve_stockpile_target_speculation(state, markets, c);
 				auto local_wage_rating = state.defines.alice_needs_scaling_factor * state.world.province_get_labor_price(capitals, labor::no_education) + 0.00001f;
-				auto price_rating = (ve_price(state, markets, c)) / local_wage_rating;
+				auto price_rating = price / local_wage_rating;
 				auto actual_stockpile_to_supply = ve::min(1.f, stockpile_to_supply + price_rating);
 				auto merchants_supply = ve::max(0.f, stockpiles - stockpile_target_merchants) * actual_stockpile_to_supply;
 				state.world.market_set_supply(markets, c, state.world.market_get_supply(markets, c) + merchants_supply);

src/economy/economy.hpp

@@ -134,7 +134,7 @@ inline constexpr float stockpile_to_supply = 0.1f;
 inline constexpr float stockpile_spoilage = 0.05f;
 inline constexpr float stockpile_expected_spending_per_commodity = 1'000.f;
 inline constexpr float market_savings_target = 1'000'000.f;
-inline constexpr float trade_transaction_soft_limit = 10'000.f;
+inline constexpr float trade_transaction_soft_limit = 1'000.f;
 
 // trade related
 inline constexpr float merchant_cut_foreign = 0.05f;

src/economy/economy_production.cpp

@@ -1666,6 +1666,11 @@ void update_employment(sys::state& state) {
 					1.f,
 					min_wage + actual_wage
 				);
+
+				// prevent artisans from expanding demand on missing goods too fast
+				auto inputs_data = get_inputs_data(state, markets, state.world.commodity_get_artisan_inputs(cid));
+				gradient = ve::select(gradient > 0.f, gradient * (inputs_data.min_available + 0.01f), gradient);
+
 				ve::fp_vector decay = ve::select(base_profit < 0.f, ve::fp_vector{ 0.9f }, ve::fp_vector{ 1.f });
 				auto new_employment = ve::select(mask, ve::max(current_employment_target * decay + 10.f * gradient / state.world.commodity_get_artisan_output_amount(cid), 0.0f), 0.f);
 				state.world.province_set_artisan_score(ids, cid, ve::min(local_population, new_employment));

src/economy/economy_stats.cpp

@@ -643,12 +643,49 @@ ve::fp_vector ve_market_speculation_budget(
 	return market_speculation_budget<ve::tagged_vector<dcon::market_id>>(state, m, c);
 }
 
+float stockpile_target_speculation(
+	sys::state const& state,
+	dcon::market_id m,
+	dcon::commodity_id c
+) {
+	return std::max(0.f, market_speculation_budget(state, m, c) / (price(state, m, c) + 1.f) - 0.5f);
+}
+template<typename M>
+ve::fp_vector stockpile_target_speculation(
+	sys::state const& state,
+	M m,
+	dcon::commodity_id c
+) {
+	return ve::max(0.f, market_speculation_budget(state, m, c) / (ve_price(state, m, c) + 1.f) - 0.5f);
+}
+ve::fp_vector ve_stockpile_target_speculation(
+	sys::state const& state,
+	ve::contiguous_tags<dcon::market_id> m,
+	dcon::commodity_id c
+) {
+	return stockpile_target_speculation<ve::contiguous_tags<dcon::market_id>>(state, m, c);
+}
+ve::fp_vector ve_stockpile_target_speculation(
+	sys::state const& state,
+	ve::partial_contiguous_tags<dcon::market_id> m,
+	dcon::commodity_id c
+) {
+	return stockpile_target_speculation<ve::partial_contiguous_tags<dcon::market_id>>(state, m, c);
+}
+ve::fp_vector ve_stockpile_target_speculation(
+	sys::state const& state,
+	ve::tagged_vector<dcon::market_id> m,
+	dcon::commodity_id c
+) {
+	return stockpile_target_speculation<ve::tagged_vector<dcon::market_id>>(state, m, c);
+}
+
 float trade_supply(sys::state& state,
 	dcon::market_id m,
 	dcon::commodity_id c
 ) {
 	auto stockpiles = state.world.market_get_stockpile(m, c);
-	auto stockpile_target_merchants = market_speculation_budget(state, m, c) / (price(state, m, c) + 1.f);
+	auto stockpile_target_merchants = stockpile_target_speculation(state, m, c);
 	auto sid = state.world.market_get_zone_from_local_market(m);
 	auto capital = state.world.state_instance_get_capital(sid);
 	auto wage = state.world.province_get_labor_price(capital, labor::no_education);
@@ -659,7 +696,6 @@ float trade_supply(sys::state& state,
 	return result;
 }
 
-
 float trade_supply(sys::state& state,
 	dcon::nation_id n,
 	dcon::commodity_id c
@@ -678,7 +714,7 @@ float trade_demand(sys::state& state,
 	dcon::commodity_id c
 ) {
 	auto stockpiles = state.world.market_get_stockpile(m, c);
-	auto stockpile_target_merchants = market_speculation_budget(state, m, c) / (price(state, m, c) + 1.f);
+	auto stockpile_target_merchants = stockpile_target_speculation(state, m, c);
 	auto sid = state.world.market_get_zone_from_local_market(m);
 	auto capital = state.world.state_instance_get_capital(sid);
 	auto wage = state.world.province_get_labor_price(capital, labor::no_education);

src/economy/economy_stats.hpp

@@ -65,6 +65,34 @@ ve::fp_vector ve_market_speculation_budget(
 	ve::tagged_vector<dcon::market_id> m,
 	dcon::commodity_id c
 );
+
+float stockpile_target_speculation(
+	sys::state const& state,
+	dcon::market_id m,
+	dcon::commodity_id c
+);
+template<typename M>
+ve::fp_vector stockpile_target_speculation(
+	sys::state const& state,
+	M m,
+	dcon::commodity_id c
+);
+ve::fp_vector ve_stockpile_target_speculation(
+	sys::state const& state,
+	ve::contiguous_tags<dcon::market_id> m,
+	dcon::commodity_id c
+);
+ve::fp_vector ve_stockpile_target_speculation(
+	sys::state const& state,
+	ve::partial_contiguous_tags<dcon::market_id> m,
+	dcon::commodity_id c
+);
+ve::fp_vector ve_stockpile_target_speculation(
+	sys::state const& state,
+	ve::tagged_vector<dcon::market_id> m,
+	dcon::commodity_id c
+);
+
 ve::fp_vector ve_price(
 	sys::state const& state,
 	ve::contiguous_tags<dcon::market_id> s,