minor adjustments

Author: ineveraskedforthis

assets/localisation/en-US/alice.csv

@@ -1310,7 +1310,7 @@ ledger_ppp_gdp_per_capita;GDP(PPP) per 1m people
 ledger_inflation_adjusted_gdp;GDP(inflation-adjusted)
 ledger_inflation_adjusted_gdp_per_capita;GDP(inflation-adjusted) per 1m people
 ledger_standard_of_living;Standard of Living
-alice_ledger_header_gdp_history;GDP(PPP) over time
+alice_ledger_header_gdp_history;GDP(inflation-adjusted) over time
 alice_countryalert_colonialgood_start;You can colonize $region$
 alice_overseas_mil_description;Overseas militancy
 alice_armygroup_go_to_selection;Add/remove units

src/economy/construction.cpp

@@ -1170,7 +1170,7 @@ void emulate_construction_demand(sys::state& state, dcon::nation_id n) {
 	// simulate spending on construction of units
 	// useful to help the game start with some production of artillery and small arms
 
-	float income_to_build_units = 10'000.f;
+	float income_to_build_units = 1'000.f;
 
 	if(state.world.nation_get_owned_province_count(n) == 0) {
 		return;
@@ -1232,7 +1232,7 @@ void emulate_construction_demand(sys::state& state, dcon::nation_id n) {
 	// simulate spending on construction of factories
 	// helps with machine tools and cement
 
-	float income_to_build_factories = 100'000.f;
+	float income_to_build_factories = 1'000.f;
 
 	state.world.nation_for_each_state_ownership(n, [&](auto soid) {
 		auto local_state = state.world.state_ownership_get_state(soid);

src/economy/economy.cpp

@@ -480,7 +480,7 @@ void convert_commodities_into_ingredients(
 void presimulate(sys::state& state) {
 	// economic updates without construction
 #ifdef NDEBUG
-	uint32_t steps = 365;
+	uint32_t steps = 10;
 #else
 	uint32_t steps = 2;
 #endif
@@ -1767,11 +1767,11 @@ void update_pop_consumption(
 		is_poor = ve::min(1.f, ve::max(0.f, is_poor + (1.f - current_life) * 2.f));
 
 		auto life_spending_mod = //ve::fp_vector{ 1.f };
-			(savings * state.defines.alice_needs_lf_spend) * (1.f - is_poor) + is_poor;
+			(state.defines.alice_needs_lf_spend) * (1.f - is_poor) + is_poor;
 		auto everyday_spending_mod =
-			(savings * state.defines.alice_needs_ev_spend) * (1.f - is_poor);
+			(state.defines.alice_needs_ev_spend) * (1.f - is_poor);
 		auto luxury_spending_mod =
-			(savings * state.defines.alice_needs_lx_spend) * (1.f - is_poor);
+			(state.defines.alice_needs_lx_spend) * (1.f - is_poor);
 
 		// clamp
 		life_spending_mod = ve::max(0.f, ve::min(1.f, life_spending_mod));
@@ -2933,7 +2933,7 @@ void daily_update(sys::state& state, bool presimulation, float presimulation_sta
 			);
 
 			decay = ve::max(decay, 0.95f);
-			
+
 			// expand the route slower if goods are not actually bought:
 			auto bought_A = state.world.market_get_demand_satisfaction(A, c);
 			auto bought_B = state.world.market_get_demand_satisfaction(B, c);
@@ -2943,12 +2943,11 @@ void daily_update(sys::state& state, bool presimulation, float presimulation_sta
 				bought_B
 			);
 			change = ve::select(
-				change * current_volume > 0.f, // change and volume are collinear
-				change * ve::max(0.01f, (bought - 0.5f) * 2.f),
+				change * current_volume >= 0.f, // change and volume are collinear
+				change * ve::max(0.0000001f, (bought - 0.5f) * 2.f),
 				change
 			);
 
-
 			change = ve::select(current_volume > 0.05f,
 				ve::min(ve::max(change, max_shrinking), max_expansion),
 				ve::select(current_volume < -0.05f,

src/economy/economy.hpp

@@ -126,7 +126,7 @@ inline constexpr float factory_closed_threshold = 0.0001f;
 inline constexpr uint32_t price_history_length = 256;
 inline constexpr uint32_t gdp_history_length = 128;
 inline constexpr float price_speed_mod = 0.001f;
-inline constexpr float price_rigging = 0.02f;
+inline constexpr float price_rigging = 0.001f;
 inline constexpr float production_throughput_multiplier = 2.5f; // for the sake of machine tools
 
 // stockpile related things:
@@ -147,8 +147,8 @@ inline constexpr float trade_distance_covered_by_pair_of_workers_per_unit_of_goo
 // profit cuts change distribution of incomes
 inline constexpr float aristocrats_greed = 0.1f;
 inline constexpr float artisans_greed = 0.001f;
-inline constexpr float labor_greed_life = 0.5f;
-inline constexpr float labor_greed_everyday = 0.1f;
+inline constexpr float labor_greed_life = 0.05f;
+inline constexpr float labor_greed_everyday = 0.f;
 // inline constexpr float capitalists_greed = 1.f; // for future use
 
 void presimulate(sys::state& state);

src/economy/economy_stats.cpp

@@ -618,7 +618,7 @@ ve::fp_vector market_speculation_budget(
 	auto capital = state.world.state_instance_get_capital(sid);
 	auto population = state.world.state_instance_get_demographics(sid, demographics::total);
 	auto wage = state.world.province_get_labor_price(capital, labor::no_education);
-	auto local_speculation_budget = wage * population / 100.f;
+	auto local_speculation_budget = wage * population / 20.f;
 	return ve::max(0.f, local_speculation_budget);
 }
 ve::fp_vector ve_market_speculation_budget(
@@ -648,15 +648,15 @@ float stockpile_target_speculation(
 	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);
+	return std::max(0.f, market_speculation_budget(state, m, c) / (price(state, m, c) + 0.001f) - 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);
+	return ve::max(0.f, market_speculation_budget(state, m, c) / (ve_price(state, m, c) + 0.001f) - 0.5f);
 }
 ve::fp_vector ve_stockpile_target_speculation(
 	sys::state const& state,