Display combat win rate

C3X.h

@@ -135,6 +135,18 @@ enum unit_cycle_search_criteria {
 	UCSC_SIMILAR_NEAR_DESTINATION
 };
 
+enum combat_odds_hud_mode {
+	COHM_NONE = 0,
+	COHM_ATTACK,
+	COHM_BOMBARD
+};
+
+enum combat_win_rate_display_mode {
+	CWRDM_OFF = 0,
+	CWRDM_COMPACT,
+	CWRDM_DETAILED
+};
+
 enum no_ai_patrol_override {
 	NAPO_ZERO = 0,
 	NAPO_ONE,
@@ -271,7 +283,7 @@ struct counter_rule {
 	char * district_name;     // Resolved after district configs are loaded
 	unsigned int self_experience_mask;  // 0 = no restriction
 	unsigned int enemy_experience_mask; // 0 = no restriction
-	bool   ignore_defensive_bonuses; // true = defender receives no defensive bonuses
+	bool   ignore_defensive_bonuses; // Forward match only: defender receives no defensive bonuses
 
 	// Effects (percent values, 100 = no change)
 	int    self_atk_pct;
@@ -282,6 +294,13 @@ struct counter_rule {
 	int    enemy_bombard_pct;
 };
 
+struct counter_effect_summary {
+	int attacker_atk_pct;
+	int defender_def_pct;
+	int bombard_pct;
+	bool ignore_defensive_bonuses;
+};
+
 struct c3x_config {
 	bool enable_stack_bombard;
 	bool enable_disorder_warning;
@@ -400,6 +419,7 @@ struct c3x_config {
 	bool remove_land_artillery_target_restrictions;
 	bool allow_bombard_of_other_improvs_on_occupied_airfield;
 	bool show_total_city_count;
+	enum combat_win_rate_display_mode combat_win_rate_display_mode;
 	bool strengthen_forbidden_palace_ocn_effect;
 	int extra_unit_maintenance_per_shields;
 	enum special_zone_of_control_rules special_zone_of_control_rules;
@@ -773,6 +793,16 @@ enum c3x_label {
 	CL_SCIENTIFIC,
 	CL_SEAFARING,
 
+	// Main-screen combat odds HUD
+	CL_COMBAT_WIN_CHANCE,
+	CL_BOMBARD_DAMAGE_CHANCE,
+	CL_COMBAT_VS,
+	CL_COUNTER_ATTACK,
+	CL_COUNTER_DEFENSE,
+	CL_COUNTER_BOMBARD,
+	CL_COUNTER_IGNORES_DEFENSIVE_BONUSES,
+	CL_COUNTER_NO_EFFECT,
+
 	COUNT_C3X_LABELS
 };
 
@@ -2142,6 +2172,21 @@ struct injected_state {
 		Unit * defender;
 	} counter_army_attacker_selection_ctx;
 
+	struct combat_odds_hud_state {
+		bool active;
+		enum combat_odds_hud_mode mode;
+		int tile_x, tile_y;
+		int attacker_unit_id, target_unit_id;
+		int attacker_unit_type_id, target_unit_type_id;
+		int percent_basis_points;
+		struct counter_effect_summary counter_effects;
+		char text[64];
+	} combat_odds_hud;
+	PCX_Image combat_odds_hud_compact_backdrop;
+	enum init_state combat_odds_hud_compact_backdrop_state;
+	PCX_Image combat_odds_hud_detailed_backdrop;
+	enum init_state combat_odds_hud_detailed_backdrop_state;
+
 	// Used to extract which unit (if any) exerted zone of control from within Fighter::apply_zone_of_control.
 	Unit * zoc_interceptor;
 

Text/c3x-labels.txt

@@ -170,3 +170,13 @@ Militaristic
 Religious
 Scientific
 Seafaring
+
+; Main-screen combat odds HUD
+Win rate:
+Damage rate:
+vs
+Attack
+Defense
+Bombard
+Ignores defensive bonuses
+No counter effect

civ_prog_objects.csv

@@ -24,6 +24,7 @@ define,    0x5601EF,	0x56C2E3,	0x56019F,	"ADDR_SCIENCE_AGE_BUG_PATCH",			"void *
 define,    0x4CD0B1,	0x4D5151,	0x4CD171,	"ADDR_PEDIA_TEXTURE_BUG_PATCH",			"void *"
 define,    0x5640AC,	0x570385,	0x56405C,	"ADDR_AUTORAZE_BYPASS",				"void *"
 repl vptr, 0x66CB50,	0x689C3C,	0x66CB50,	"Leader_impl_would_raze_city",			"bool (__fastcall *) (Leader * this, int edx, City * city)"
+repl vptr, 0x66B444,	0x688544,	0x66B444,	"Main_Screen_Form_process_mouse_hover",	"void (__fastcall *) (Main_Screen_Form * this, int edx, int local_x, int local_y)"
 repl vptr, 0x66B44C,	0x68854C,	0x66B44C,	"Main_Screen_Form_handle_left_click_on_map_1",	"void (__fastcall *) (Main_Screen_Form * this, int edx, int param_1, int param_2)"
 inlead,	   0x4EA210,	0x4F3000,	0x4EA2D0,	"Main_Screen_Form_handle_right_click_on_tile",	"void (__fastcall *) (Main_Screen_Form * this, int edx, int tile_x, int tile_y, int mouse_x, int mouse_y)"
 inlead,	   0x4E8850,	0x4F14E0,	0x4E8910,	"Main_Screen_Form_open_right_click_menu",	"void (__fastcall *) (Main_Screen_Form * this, int edx, int tile_x, int tile_y, int mouse_x, int mouse_y)"

default.c3x_config.ini

@@ -181,6 +181,11 @@ expand_civilopedia_unit_stats = true
 ; This option also shows 'Moves' for immobile units such as aircraft, which the base game does not
 expand_right_click_menu_unit_stats = true
 
+; Shows combat win rate in a box above the minimap when a selected human unit hovers a visible enemy target. Possible values are "off", "compact",
+; and "detailed". Compact shows only the win or damage rate. Detailed also shows the units and any counter-rule attack, defense, bombard, or defensive
+; bonus effects. Normal attacks show full-combat win chance. Bombard actions show the chance to deal at least 1 HP damage.
+combat_win_rate_display_mode = detailed
+
 [====================]
 [=== OPTIMIZATION ===]
 [====================]