Figure counting functions

src/building/construction_clear.c

@@ -158,7 +158,7 @@ static int clear_land_confirmed(int measure_only, int x_start, int y_start, int
                 items_placed++;
                 map_aqueduct_remove(grid_offset);
             } else if (map_terrain_is(grid_offset, TERRAIN_WATER)) { //only bridges fall here
-                if (!measure_only && map_bridge_count_figures(grid_offset) > 0) {
+                if (!measure_only && (map_bridge_has_figures(grid_offset) && !config_get(CONFIG_GP_CH_ALWAYS_DESTROY_BRIDGES))) {
                     city_warning_show(WARNING_PEOPLE_ON_BRIDGE, NEW_WARNING_SLOT);
                 } else if (confirm.bridge_confirmed == 1) {
                     map_bridge_remove(grid_offset, measure_only);

src/core/config.c

@@ -113,6 +113,7 @@ static const char *ini_keys[] = {
     [CONFIG_GENERAL_UNLOCK_MOUSE] = "general_unlock_mouse",
     [CONFIG_GP_CH_HOUSING_PRE_MERGE_VACANT_LOTS] = "gp_ch_housing_pre_merge_vacant_lots",
     [CONFIG_UI_BUILD_SHOW_RESERVOIR_RANGES] = "ui_build_show_reservoir_ranges",
+    [CONFIG_GP_CH_ALWAYS_DESTROY_BRIDGES] = "always_be_able_to_destroy_bridges"
 };
 
 static const char *ini_string_keys[] = {
@@ -175,6 +176,7 @@ static int default_values[CONFIG_MAX_ENTRIES] = {
     [CONFIG_GENERAL_UNLOCK_MOUSE] = 1,
     [CONFIG_GP_CH_HOUSING_PRE_MERGE_VACANT_LOTS] = 1,
     [CONFIG_UI_BUILD_SHOW_RESERVOIR_RANGES] = 1,
+    [CONFIG_GP_CH_ALWAYS_DESTROY_BRIDGES] = 0
 };
 
 static const char default_string_values[CONFIG_STRING_MAX_ENTRIES][CONFIG_STRING_VALUE_MAX] = { 0 };

src/core/config.h

@@ -103,6 +103,7 @@ typedef enum {
     CONFIG_GENERAL_UNLOCK_MOUSE,
     CONFIG_GP_CH_HOUSING_PRE_MERGE_VACANT_LOTS,
     CONFIG_UI_BUILD_SHOW_RESERVOIR_RANGES,
+    CONFIG_GP_CH_ALWAYS_DESTROY_BRIDGES,
     CONFIG_MAX_ENTRIES
 } config_key;
 

src/figure/combat.c

@@ -405,13 +405,16 @@ int figure_combat_get_missile_target_for_enemy(figure *enemy, int max_distance,
 
 static int can_attack_animal(figure_category category, figure_category opponent_category, formation *l, figure *opponent)
 {
-    if (category != FIGURE_CATEGORY_ARMED || opponent_category != FIGURE_CATEGORY_ANIMAL) {
+    if (!(category == FIGURE_CATEGORY_ARMED || category == FIGURE_CATEGORY_HOSTILE) || opponent_category != FIGURE_CATEGORY_ANIMAL) {
         return 0;
     }
+    if (category == FIGURE_CATEGORY_HOSTILE) {
+        return 1;
+    }
     if (config_get(CONFIG_GP_CH_AUTO_KILL_ANIMALS)) {
         return 1;
     }
-    if (l->target_formation_id && l->target_formation_id == opponent->formation_id) {
+    if ((l->target_formation_id && l->target_formation_id == opponent->formation_id) || FIGURE_CATEGORY_AGGRESSIVE_ANIMAL) {
         return 1;
     }
     return 0;
@@ -449,30 +452,16 @@ void figure_combat_attack_figure_at(figure *f, int grid_offset)
             if (opponent->action_state == FIGURE_ACTION_159_NATIVE_ATTACKING) {
                 attack = 1;
             }
-        } else if (category == FIGURE_CATEGORY_ARMED && opponent_category == FIGURE_CATEGORY_CRIMINAL) {
-            attack = 1;
         } else if (category == FIGURE_CATEGORY_ARMED && opponent_category == FIGURE_CATEGORY_HOSTILE) {
             attack = 1;
-        } else if (category == FIGURE_CATEGORY_ARMED && opponent_category == FIGURE_CATEGORY_AGGRESSIVE_ANIMAL) {
-            attack = 1;
         } else if (category == FIGURE_CATEGORY_HOSTILE && opponent_category == FIGURE_CATEGORY_CITIZEN) {
             attack = 1;
-        } else if (category == FIGURE_CATEGORY_HOSTILE && opponent_category == FIGURE_CATEGORY_ARMED) {
-            attack = 1;
         } else if (category == FIGURE_CATEGORY_HOSTILE && opponent_category == FIGURE_CATEGORY_CRIMINAL) {
             attack = 1;
-        } else if (category == FIGURE_CATEGORY_HOSTILE && opponent_category == FIGURE_CATEGORY_ANIMAL) {
-            attack = 1;
-        } else if (category == FIGURE_CATEGORY_HOSTILE && opponent_category == FIGURE_CATEGORY_AGGRESSIVE_ANIMAL) {
-            attack = 1;
         } else if (category == FIGURE_CATEGORY_AGGRESSIVE_ANIMAL && opponent_category == FIGURE_CATEGORY_CITIZEN) {
             attack = 1;
         } else if (category == FIGURE_CATEGORY_AGGRESSIVE_ANIMAL && opponent_category == FIGURE_CATEGORY_ARMED) {
             attack = 1;
-        } else if (category == FIGURE_CATEGORY_AGGRESSIVE_ANIMAL && opponent_category == FIGURE_CATEGORY_CRIMINAL) {
-            attack = 1;
-        } else if (category == FIGURE_CATEGORY_AGGRESSIVE_ANIMAL && opponent_category == FIGURE_CATEGORY_ANIMAL) {
-            attack = 1;
         } else if (category == FIGURE_CATEGORY_AGGRESSIVE_ANIMAL && opponent_category == FIGURE_CATEGORY_HOSTILE) {
             attack = 1;
         } else if (can_attack_animal(category, opponent_category, l, opponent)) {

src/figure/figure.c

@@ -10,6 +10,7 @@
 #include "game/save_version.h"
 #include "empire/city.h"
 #include "figure/name.h"
+#include "figure/properties.h"
 #include "figure/route.h"
 #include "figure/trader.h"
 #include "figure/visited_buildings.h"
@@ -293,6 +294,12 @@ int figure_is_herd(const figure *f)
     return f->type >= FIGURE_SHEEP && f->type <= FIGURE_ZEBRA;
 }
 
+int figure_is_category(figure *f, figure_category category)
+{
+    const figure_properties *f_props = figure_properties_for_type(f->type);
+    return f_props->category & category;
+}
+
 static void initialize_new_figure(figure *f, unsigned int position)
 {
     f->id = position;

src/figure/figure.h

@@ -4,6 +4,7 @@
 #include "core/buffer.h"
 #include "core/direction.h"
 #include "figure/action.h"
+#include "figure/properties.h"
 #include "figure/type.h"
 
 #define FIGURE_FACTION_ROAMER_PREVIEW 2
@@ -156,6 +157,8 @@ int figure_is_legion(const figure *f);
 
 int figure_is_herd(const figure *f);
 
+int figure_is_category(figure *f, figure_category category);
+
 void figure_init_scenario(void);
 
 void figure_kill_all(void);