Merge pull request #1990 from SneakBug8/hotfixes

Let always available CBs have infamy cost with define

Author: schombert

src/gamestate/commands.cpp

@@ -3109,6 +3109,7 @@ void execute_declare_war(sys::state& state, dcon::nation_id source, dcon::nation
 	if(state.world.overlord_get_ruler(target_ol_rel) && state.world.overlord_get_ruler(target_ol_rel) != source)
 		real_target = state.world.overlord_get_ruler(target_ol_rel);
 
+	// Infamy, militancy and prestige loss for truce break
 	if(military::has_truce_with(state, source, real_target)) {
 		auto cb_infamy = military::truce_break_cb_infamy(state, primary_cb, target);
 		auto cb_militancy = military::truce_break_cb_militancy(state, primary_cb);
@@ -3125,6 +3126,12 @@ void execute_declare_war(sys::state& state, dcon::nation_id source, dcon::nation
 			}
 		}
 	}
+	// Infamy for war declaration when applicable
+	else {
+		auto cb_infamy = military::war_declaration_infamy_cost(state, primary_cb, source, target, cb_state);
+		auto& current_infamy = state.world.nation_get_infamy(source);
+		state.world.nation_set_infamy(source, current_infamy + cb_infamy);
+	}
 
 	// remove used cb
 	auto current_cbs = state.world.nation_get_available_cbs(source);

src/gamestate/modifiers.hpp

@@ -146,7 +146,7 @@ namespace sys {
 	MOD_LIST_ELEMENT(76, non_accepted_pop_consciousness_modifier, true, modifier_display_type::fp_two_places, \
 			"modifier_non_accepted_pop_consciousness_modifier")                                                                        \
 	MOD_LIST_ELEMENT(77, cb_generation_speed_modifier, true, modifier_display_type::percent, "cb_manufacture_tech")                \
-	MOD_LIST_ELEMENT(78, mobilization_impact, true, modifier_display_type::percent, "modifier_mobilization_impact")               \
+	MOD_LIST_ELEMENT(78, mobilization_impact, false, modifier_display_type::percent, "modifier_mobilization_impact")               \
 	MOD_LIST_ELEMENT(79, suppression_points_modifier, true, modifier_display_type::percent, "suppression_tech")                    \
 	MOD_LIST_ELEMENT(80, education_efficiency_modifier, true, modifier_display_type::percent, "modifier_education_efficiency")     \
 	MOD_LIST_ELEMENT(81, civilization_progress_modifier, true, modifier_display_type::percent, "modifier_civilization_progress")   \

src/gui/topbar_subwindows/diplomacy_subwindows/gui_pick_wargoal_window.hpp

@@ -35,6 +35,27 @@ class wargoal_type_item_button : public tinted_button_element_base {
 		dcon::nation_id target = retrieve<dcon::nation_id>(state, parent);
 		auto target_state = retrieve<dcon::state_definition_id>(state, parent);
 
+		auto fat_id = dcon::fatten(state.world, content);
+		set_button_text(state, text::produce_simple_string(state, fat_id.get_name()));
+
+		auto other_cbs = state.world.nation_get_available_cbs(state.local_player_nation);
+		bool can_use = military::cb_conditions_satisfied(state, state.local_player_nation, target, content) && [&]() {
+			if((state.world.cb_type_get_type_bits(content) & military::cb_flag::always) != 0) {
+				return true;
+			}
+			for(auto& fabbed : other_cbs) {
+				if(fabbed.cb_type == content && fabbed.target == target)
+					return true;
+			}
+			return false;
+			}();
+
+		disabled = !can_use;
+		if(disabled) {
+			color = sys::pack_color(255, 255, 255);
+			return;
+		}
+
 		auto war = retrieve<dcon::war_id>(state, parent);
 		auto cb_infamy = !war
 			? (military::has_truce_with(state, state.local_player_nation, target)
@@ -46,9 +67,6 @@ class wargoal_type_item_button : public tinted_button_element_base {
 		} else {
 			color = sys::pack_color(255, 255, 255);
 		}
-
-		auto fat_id = dcon::fatten(state.world, content);
-		set_button_text(state, text::produce_simple_string(state, fat_id.get_name()));
 	}
 
 	tooltip_behavior has_tooltip(sys::state& state) noexcept override {
@@ -204,6 +222,7 @@ class wargoal_type_listbox : public listbox_element_base<wargoal_type_item, dcon
 					row_contents.push_back(cb);
 				}
 			}
+
 		}
 
 		update(state);
@@ -385,8 +404,15 @@ class wargoal_add_infamy : public color_text_element {
 				color = text::text_color::red;
 				set_text(state, text::format_float(cb_infamy, 1));
 			} else {
-				color = text::text_color::white;
-				set_text(state, "0.0");
+				auto cb_infamy = military::war_declaration_infamy_cost(state, cb, source, target, target_state);
+
+				if(cb_infamy > 0.f) {
+					color = text::text_color::red;
+				}
+				else {
+					color = text::text_color::white;
+				}
+				set_text(state, text::format_float(cb_infamy, 1));
 			}
 		} else {
 			color = text::text_color::white;

src/military/military.cpp

@@ -2367,7 +2367,7 @@ float cb_addition_infamy_cost(sys::state& state, dcon::war_id war, dcon::cb_type
 	}
 
 	// Always available CBs cost zero infamy
-	if((state.world.cb_type_get_type_bits(type) & military::cb_flag::always) != 0) {
+	if((state.world.cb_type_get_type_bits(type) & military::cb_flag::always) != 0 && state.defines.alice_always_available_cbs_zero_infamy != 0.f) {
 		return 0.0f;
 	}
 
@@ -2383,6 +2383,27 @@ float cb_addition_infamy_cost(sys::state& state, dcon::war_id war, dcon::cb_type
 		return cb_infamy(state, type, target, cb_state);
 }
 
+float war_declaration_infamy_cost(sys::state& state, dcon::cb_type_id type, dcon::nation_id from,
+		dcon::nation_id target, dcon::state_definition_id cb_state) {
+	if((state.world.cb_type_get_type_bits(type) & (military::cb_flag::is_not_constructing_cb)) != 0) {
+		// not a constructible CB
+		return 0.0f;
+	}
+
+	// Always available CBs cost zero infamy
+	if((state.world.cb_type_get_type_bits(type) & military::cb_flag::always) != 0 && state.defines.alice_always_available_cbs_zero_infamy != 0.f) {
+		return 0.0f;
+	}
+
+	auto other_cbs = state.world.nation_get_available_cbs(from);
+	for(auto& cb : other_cbs) {
+		if(cb.target == target && cb.cb_type == type && cb_conditions_satisfied(state, from, target, cb.cb_type))
+			return 0.0f;
+	}
+
+	return cb_infamy(state, type, target, cb_state);
+}
+
 bool cb_requires_selection_of_a_valid_nation(sys::state const& state, dcon::cb_type_id t) {
 	auto allowed_nation = state.world.cb_type_get_allowed_countries(t);
 	return bool(allowed_nation);
@@ -4275,6 +4296,7 @@ void update_ticking_war_score(sys::state& state) {
 
 		auto bits = wg.get_type().get_type_bits();
 		if((bits & (cb_flag::po_annex | cb_flag::po_transfer_provinces | cb_flag::po_demand_state)) != 0) {
+			// Calculate occupations
 			float total_count = 0.0f;
 			float occupied = 0.0f;
 			if(wg.get_associated_state()) {
@@ -4309,23 +4331,27 @@ void update_ticking_war_score(sys::state& state) {
 				}
 			}
 
+			// Adjust warscore based on occupation rates
 			if(total_count > 0.0f) {
 				float fraction = occupied / total_count;
 				if(fraction >= state.defines.tws_fulfilled_idle_space || (wg.get_ticking_war_score() < 0 && occupied > 0.0f)) {
 					wg.set_ticking_war_score(wg.get_ticking_war_score() + state.defines.tws_fulfilled_speed * fraction);
 				} else if(occupied == 0.0f) {
+					// Ticking warscore may go into negative only after grace period ends
+					// Ticking warscore may drop to zero before grace period ends
 					if(wg.get_ticking_war_score() > 0.0f || war.get_start_date() + int32_t(state.defines.tws_grace_period_days) <= state.current_date) {
 						wg.set_ticking_war_score(wg.get_ticking_war_score() - state.defines.tws_not_fulfilled_speed);
 					}
+					}
 				}
 			}
-		}
 
 		// Ticking warscope for make_puppet war
+		// If capital of the target nation is occupied - increase ticking warscore
+		// If any province of the target nation is occupied - no changes
+		// Otherwise, after grace period, decrease ticking warscore
 		if((bits & cb_flag::po_make_puppet) != 0 || (bits & cb_flag::po_make_substate) != 0) {
-
 			auto target = wg.get_target_nation().get_capital();
-
 			bool any_occupied = false;
 			for(auto prv : wg.get_target_nation().get_province_ownership()) {
 				if(!prv.get_province().get_is_colonial() && get_role(state, war, prv.get_province().get_nation_from_province_control()) == role) {
@@ -4337,7 +4363,10 @@ void update_ticking_war_score(sys::state& state) {
 				wg.set_ticking_war_score(wg.get_ticking_war_score() + state.defines.tws_fulfilled_speed);
 			} else if(any_occupied) {
 				// We hold some non-colonial province of the target, stay at zero
-			} else if(wg.get_ticking_war_score() > 0.0f || war.get_start_date() + int32_t(state.defines.tws_grace_period_days) <= state.current_date) {
+			}
+			// Ticking warscore may go into negative only after grace period ends
+			// Ticking warscore may drop to zero before grace period ends
+			else if(wg.get_ticking_war_score() > 0.0f || war.get_start_date() + int32_t(state.defines.tws_grace_period_days) <= state.current_date) {
 				wg.set_ticking_war_score(wg.get_ticking_war_score() - state.defines.tws_not_fulfilled_speed);
 			}
 		}
@@ -4374,8 +4403,9 @@ void update_ticking_war_score(sys::state& state) {
 				}
 			}
 		}
-		auto max_score = peace_cost(state, war, wg.get_type(), wg.get_added_by(), wg.get_target_nation(), wg.get_secondary_nation(), wg.get_associated_state(), wg.get_associated_tag()) * 2.f;
 
+		// Ticking warscore may not be bigger than 2x the wargoal enforcement cost
+		auto max_score = peace_cost(state, war, wg.get_type(), wg.get_added_by(), wg.get_target_nation(), wg.get_secondary_nation(), wg.get_associated_state(), wg.get_associated_tag()) * 2.f;
 		wg.set_ticking_war_score(std::clamp(wg.get_ticking_war_score(), -float(max_score), float(max_score)));
 	}
 }

src/military/military.hpp

@@ -419,6 +419,8 @@ int32_t defender_peace_cost(sys::state& state, dcon::war_id war);
 float successful_cb_prestige(sys::state& state, dcon::cb_type_id type, dcon::nation_id actor);
 float cb_infamy(sys::state& state, dcon::cb_type_id t, dcon::nation_id target, dcon::state_definition_id cb_state = dcon::state_definition_id{}); // the fabrication cost in infamy
 
+float war_declaration_infamy_cost(sys::state& state, dcon::cb_type_id type, dcon::nation_id from,
+		dcon::nation_id target, dcon::state_definition_id cb_state = dcon::state_definition_id{ }); // the cost of starting a war with a CB -- does NOT check if the CB is valid to add
 float cb_addition_infamy_cost(sys::state& state, dcon::war_id war, dcon::cb_type_id type, dcon::nation_id from,
 		dcon::nation_id target, dcon::state_definition_id cb_state = dcon::state_definition_id{ }); // the cost of adding a particular cb to the war -- does NOT check if the CB is valid to add
 float crisis_cb_addition_infamy_cost(sys::state& state, dcon::cb_type_id type, dcon::nation_id from, dcon::nation_id target, dcon::state_definition_id cb_state);

src/parsing/defines.hpp

@@ -750,8 +750,6 @@
 	LUA_DEFINES_LIST_ELEMENT(alice_naval_combat_stacking_damage_penalty, 0.5) \
 	LUA_DEFINES_LIST_ELEMENT(alice_globe_mean_radius_km, 6371.0) \
 
-
-
 // scales the needs values so that they are needs per this many pops
 // this value was arrived at by looking at farmers: 40'000 farmers produces enough grain to satisfy about 2/3
 // of the nominal life needs value for themselves. If we assume that there is supposed to be enough grain in the world