Merge pull request #1992 from SneakBug8/feature/military

Province victory points & CB types UI

Author: schombert

assets/alice.gui

@@ -4631,6 +4631,23 @@ guiTypes = {
 		quadTextureSprite = "GFX_take_province"	
 	}
 
+	iconType = {
+		name ="province_victory_points_icon"
+		extends = "province_view_header"
+		spriteType = "GFX_prestige_icon_2"
+		position = { x=125 y=43 }
+		Orientation = "UPPER_LEFT"
+	}
+	instantTextBoxType = {
+			name = "province_victory_points"
+			extends = "province_view_header"
+			position = { x=140 y =45}
+			borderSize = { 0 0}
+			maxsize = { 50 20 }
+			textureFile = ""
+			font = "vic_18"
+	}
+
 	instantTextBoxType = {
 			name = "ready_state"
 			extends = "ingame_multiplayer_entry"

assets/localisation/en-US/alice.csv

@@ -955,6 +955,13 @@ alice_province_selector_on;ON
 alice_province_selector_off;OFF
 province_selector;Selector
 province_immigrator;Immigrator
+province_victory_points;Victory points represent relative worth of the province to other provinces in the country when calculating occupation score in wars.
+province_victory_points_base;?G+1 point base?W
+province_victory_points_nb;?G+$X$ points for naval base level?W
+province_victory_points_fcount;?G+$X$ points for factories?W
+province_victory_points_fortsize;?G+$X$ points for fort level?W
+province_victory_points_mainlandcore;?Gx2 for non-overseas core?W
+province_victory_points_capital;?Gx3 for nation capital?W
 tt_a_bank;a bank
 tt_a_university;a university
 et_add_selector;enable province selector

src/gui/gui_province_window.hpp

@@ -631,6 +631,58 @@ class province_grant_province_button : public button_element_base {
 	}
 };
 
+class province_victory_points_text : public simple_text_element_base {
+public:
+	void on_update(sys::state& state) noexcept override {
+		auto p = retrieve<dcon::province_id>(state, parent);
+		auto n = state.world.province_get_nation_from_province_ownership(p);
+
+		auto vp = military::province_point_cost(state, p, n);
+		set_text(state, text::format_wholenum(vp));
+	}
+
+	tooltip_behavior has_tooltip(sys::state& state) noexcept override {
+		return tooltip_behavior::variable_tooltip;
+	}
+
+	void update_tooltip(sys::state& state, int32_t x, int32_t y, text::columnar_layout& contents) noexcept override {
+		text::add_line(state, contents, "province_victory_points");
+		auto p = retrieve<dcon::province_id>(state, parent);
+		auto n = state.world.province_get_nation_from_province_ownership(p);
+
+		text::add_line(state, contents, "province_victory_points_base");
+
+		if(!state.world.province_get_is_colonial(p)) {
+			auto nbsize = state.world.province_get_building_level(p, uint8_t(economy::province_building_type::naval_base));
+
+			if (nbsize > 0)
+				text::add_line(state, contents, "province_victory_points_nb", text::variable_type::x, nbsize);
+		}
+
+		auto fac_range = state.world.province_get_factory_location(p);
+		auto fcount = int32_t(fac_range.end() - fac_range.begin());
+
+		if (fcount > 0)
+			text::add_line(state, contents, "province_victory_points_fcount", text::variable_type::x, fcount);
+
+		auto fortsize = state.world.province_get_building_level(p, uint8_t(economy::province_building_type::fort));
+
+		if (fortsize > 0)
+			text::add_line(state, contents, "province_victory_points_fortsize", text::variable_type::x, fortsize);
+
+		auto owner_cap = state.world.nation_get_capital(n);
+		auto overseas = (state.world.province_get_continent(p) != state.world.province_get_continent(owner_cap)) &&
+			(state.world.province_get_connected_region_id(p) != state.world.province_get_connected_region_id(owner_cap));
+
+		if(state.world.province_get_is_owner_core(p) && !overseas) {
+			text::add_line(state, contents, "province_victory_points_mainlandcore");
+		}
+		if(state.world.nation_get_capital(n) == p) {
+			text::add_line(state, contents, "province_victory_points_capital");
+		}
+	}
+};
+
 class province_window_header : public window_element_base {
 private:
 	fixed_pop_type_icon* slave_icon = nullptr;
@@ -677,6 +729,10 @@ class province_window_header : public window_element_base {
 			return make_element_by_type<province_move_capital_button>(state, id);
 		} else if(name == "alice_toggle_administration") {
 			return make_element_by_type<province_toggle_administration_button>(state, id);
+		} else if(name == "province_victory_points_icon") {
+			return make_element_by_type<image_element_base>(state, id);
+		} else if(name == "province_victory_points") {
+		return make_element_by_type<province_victory_points_text>(state, id);
 		} else if(name == "alice_take_province") {
 			return make_element_by_type<province_take_province_button>(state, id);
 		} else if(name == "alice_grant_province") {

src/gui/topbar_subwindows/diplomacy_subwindows/gui_pick_wargoal_window.hpp

@@ -205,22 +205,50 @@ class wargoal_type_listbox : public listbox_element_base<wargoal_type_item, dcon
 				}
 			}
 		} else { // this is a declare war action
+			// Display all CB types sorting available ones first
+			// Buttons for unavailable CB types will be disabled
 			auto other_cbs = state.world.nation_get_available_cbs(state.local_player_nation);
+			
+			std::vector<dcon::cb_type_fat_id> cb_types;
+
 			for(auto cb : state.world.in_cb_type) {
-				bool can_use = military::cb_conditions_satisfied(state, state.local_player_nation, content, cb) && [&]() {
-					if((cb.get_type_bits() & military::cb_flag::always) != 0) {
+				cb_types.push_back(cb);
+			}
+
+			std::sort(cb_types.begin(), cb_types.end(), [&](dcon::cb_type_fat_id& a, dcon::cb_type_fat_id& b) {
+
+				bool can_use_a = military::cb_conditions_satisfied(state, state.local_player_nation, content, a) && [&]() {
+					if((a.get_type_bits() & military::cb_flag::always) != 0) {
 						return true;
 					}
 					for(auto& fabbed : other_cbs) {
-						if(fabbed.cb_type == cb && fabbed.target == content)
+						if(fabbed.cb_type == a && fabbed.target == content)
 							return true;
 					}
 					return false;
-				}();
+					}();
 
-				if(can_use) {
-					row_contents.push_back(cb);
+				bool can_use_b = military::cb_conditions_satisfied(state, state.local_player_nation, content, b) && [&]() {
+					if((b.get_type_bits() & military::cb_flag::always) != 0) {
+						return true;
+					}
+					for(auto& fabbed : other_cbs) {
+						if(fabbed.cb_type == b && fabbed.target == content)
+							return true;
+					}
+					return false;
+					}();
+
+				if(can_use_a != can_use_b) {
+					return can_use_a;
 				}
+				else {
+					return a.id.index() < b.id.index();
+				}
+			});
+
+			for(auto el : cb_types) {
+				row_contents.push_back(el);
 			}
 
 		}

src/military/military.cpp

@@ -2075,12 +2075,16 @@ float truce_break_cb_infamy(sys::state& state, dcon::cb_type_id t, dcon::nation_
 	return total * state.world.cb_type_get_break_truce_infamy_factor(t);
 }
 
+// Calculate victory points that a province P is worth in the nation N. Used for warscore, occupation rate.
+// This logic is duplicated in province_victory_points_text UI component
 int32_t province_point_cost(sys::state& state, dcon::province_id p, dcon::nation_id n) {
 	/*
-	All provinces have a base value of 1. For non colonial provinces: each level of naval base increases its value by 1. If it is
-	a state capital, its value increases by 1 for every factory in the state (factory level does not matter). Provinces get 1
-	point per fort level. This value is the doubled for non-overseas provinces where the owner has a core. It is then tripled for
-	the nation's capital province.
+	All provinces have a base value of 1.
+	For non colonial provinces: each level of naval base increases its value by 1.
+	Every fort level increases its value by 1.
+	If it is a state capital, its value increases by 1 for every factory in the state (factory level does not matter).
+	This value is the doubled for non-overseas provinces where the owner has a core.
+	It is then tripled for the nation's capital province.
 	*/
 	int32_t total = 1;
 	if(!state.world.province_get_is_colonial(p)) {
@@ -4288,52 +4292,57 @@ void update_ticking_war_score(sys::state& state) {
 		/*
 		#### Occupation score
 
+		Percentage occupied is the share of victory points in the country under occupation.
+
 		Increases by occupation-percentage x define:TWS_FULFILLED_SPEED (up to define:TWS_CB_LIMIT_DEFAULT) when the percentage
 		occupied is >= define:TWS_FULFILLED_IDLE_SPACE or when the occupation percentage is > 0 and the current occupation score
 		is negative. If there is no occupation, the score decreases by define:TWS_NOT_FULFILLED_SPEED. This can only take the
 		score into negative after define:TWS_GRACE_PERIOD_DAYS, at which point it can go to -define:TWS_CB_LIMIT_DEFAULT.
 		*/
 
 		auto bits = wg.get_type().get_type_bits();
+		static float score = 0;
 		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 total_points = 0.0f;
 			float occupied = 0.0f;
 			if(wg.get_associated_state()) {
 				for(auto prv : wg.get_associated_state().get_abstract_state_membership()) {
 					if(prv.get_province().get_nation_from_province_ownership() == wg.get_target_nation()) {
-						++total_count;
+						score = (float) province_point_cost(state, prv.get_province(), wg.get_target_nation());
+						total_points += score;
 						if(does_province_count_for_war_occupation(state, war, prv.get_province())) {
-							++occupied;
+							occupied += score;
 						}
 					}
 				}
 			} else if((bits & cb_flag::po_annex) != 0) {
 				for(auto prv : wg.get_target_nation().get_province_ownership()) {
-					++total_count;
+					score = (float)province_point_cost(state, prv.get_province(), wg.get_target_nation());
+					total_points += score;
 					if(does_province_count_for_war_occupation(state, war, prv.get_province())) {
-						++occupied;
+						occupied += score;
 					}
 				}
 			} else if(auto allowed_states = wg.get_type().get_allowed_states(); allowed_states) {
 				auto from_slot = wg.get_secondary_nation().id ? wg.get_secondary_nation().id : wg.get_associated_tag().get_nation_from_identity_holder().id;
 				bool is_lib = (bits & cb_flag::po_transfer_provinces) != 0;
 				for(auto st : wg.get_target_nation().get_state_ownership()) {
 					if(trigger::evaluate(state, allowed_states, trigger::to_generic(st.get_state().id), trigger::to_generic(wg.get_added_by().id), is_lib ? trigger::to_generic(from_slot) : trigger::to_generic(wg.get_added_by().id))) {
-
 						province::for_each_province_in_state_instance(state, st.get_state(), [&](dcon::province_id prv) {
-							++total_count;
+							score = (float)province_point_cost(state, prv, wg.get_target_nation());
+							total_points += score;
 							if(does_province_count_for_war_occupation(state, war, prv)) {
-								++occupied;
+								occupied += score;
 							}
 						});
 					}
 				}
 			}
 
 			// Adjust warscore based on occupation rates
-			if(total_count > 0.0f) {
-				float fraction = occupied / total_count;
+			if(total_points > 0.0f) {
+				float fraction = occupied / total_points;
 				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) {

src/military/military.hpp

@@ -409,6 +409,7 @@ float truce_break_cb_militancy(sys::state& state, dcon::cb_type_id type);
 float truce_break_cb_infamy(sys::state& state, dcon::cb_type_id type, dcon::nation_id target, dcon::state_definition_id cb_state = dcon::state_definition_id{});
 
 
+int32_t province_point_cost(sys::state& state, dcon::province_id p, dcon::nation_id n);
 int32_t peace_cost(sys::state& state, dcon::war_id war, dcon::cb_type_id wargoal, dcon::nation_id from, dcon::nation_id target,
 		dcon::nation_id secondary_nation, dcon::state_definition_id wargoal_state, dcon::national_identity_id wargoal_t);
 int32_t cost_of_peace_offer(sys::state& state, dcon::peace_offer_id offer);