Diggers are sorted at the top of the creature list (#3850)

So right below imps. Tunnellers or custom digging creatures a mapmaker created.

Author: Loobinex

src/config_creature.c

@@ -2203,7 +2203,7 @@ CreatureJob get_job_for_subtile(const struct Thing *creatng, MapSubtlCoord stl_x
     }
     if (creatng->owner == slabmap_owner(slb))
     {
-        if (thing_is_creature_digger(creatng)) 
+        if (thing_is_creature_digger(creatng))
         {
             if (creature_is_for_dungeon_diggers_list(creatng))
             {

src/front_input.c

@@ -2805,7 +2805,7 @@ short get_gui_inputs(short gameplay_on)
   gui_trap_type_highlighted = -1;
   gui_creature_type_highlighted = -1;
   if (gameplay_on) {
-      update_creatr_model_activities_list();
+      update_creatr_model_activities_list(0);
       maintain_my_battle_list();
   }
   if (!lbDisplay.MLeftButton)

src/keeperfx.hpp

@@ -262,7 +262,7 @@ void engine(struct PlayerInfo *player, struct Camera *cam);
 void draw_gold_total(PlayerNumber plyr_idx, long scr_x, long scr_y, long units_per_px, long long value);
 void draw_mini_things_in_hand(long x, long y);
 TbBool screen_to_map(struct Camera *camera, long screen_x, long screen_y, struct Coord3d *mappos);
-void update_creatr_model_activities_list(void);
+void update_creatr_model_activities_list(TbBool forced);
 void find_map_location_coords(TbMapLocation location, long *x, long *y, int plyr_idx, const char *func_name);
 TbBool any_player_close_enough_to_see(const struct Coord3d *pos);
 void affect_nearby_stuff_with_vortex(struct Thing *thing);

src/lvl_script_commands.c

@@ -7489,6 +7489,7 @@ static void swap_creature_process(struct ScriptContext* context)
         SCRPTERRLOG("Error swapping creatures '%s'<->'%s'", creature_code_name(ncrt_id), creature_code_name(crtr_id));
     }
     recalculate_all_creature_digger_lists();
+    update_creatr_model_activities_list(1);
 }
 
 static void set_digger_check(const struct ScriptLine* scline)
@@ -7519,14 +7520,14 @@ static void set_digger_process(struct ScriptContext* context)
         struct PlayerInfo* player = get_player(plyr_idx);
 
         player->special_digger = context->value->shorts[0];
-
         for (size_t i = 0; i < CREATURE_TYPES_MAX; i++)
         {
             if (breed_activities[i] == old_dig_model)
                 breed_activities[i] = new_dig_model;
             else if (breed_activities[i] == new_dig_model)
                 breed_activities[i] = old_dig_model;
         }
+        update_creatr_model_activities_list(1);
     }
 }
 

src/lvl_script_value.c

@@ -580,6 +580,7 @@ void script_process_value(unsigned long var_index, unsigned long plr_range_id, l
               clear_flag(crconf->model_flags,CMF_IsSpecDigger);
           }
           recalculate_all_creature_digger_lists();
+          update_creatr_model_activities_list(1);
           break;
       case 11: // ARACHNID
           if (val4 >= 1)
@@ -818,6 +819,7 @@ void script_process_value(unsigned long var_index, unsigned long plr_range_id, l
           {
               clear_flag(crconf->model_flags, CMF_IsDiggingCreature);
           }
+          update_creatr_model_activities_list(1);
           break;
       default:
           SCRPTERRLOG("Unknown creature property '%ld'", val3);

src/main.cpp

@@ -1296,48 +1296,51 @@ TbBool screen_to_map(struct Camera *camera, long screen_x, long screen_y, struct
     return result;
 }
 
-void update_creatr_model_activities_list(void)
+void update_creatr_model_activities_list(TbBool forced)
 {
-    struct Dungeon *dungeon;
-    dungeon = get_my_dungeon();
+    struct Dungeon *dungeon = get_my_dungeon();
     ThingModel crmodel;
-    int num_breeds;
-    num_breeds = no_of_breeds_owned;
+    int num_breeds = no_of_breeds_owned;
+    TbBool changed = false;
+
     // Add to breed activities
-    for (crmodel=1; crmodel < game.conf.crtr_conf.model_count; crmodel++)
+    for (crmodel = 1; crmodel < game.conf.crtr_conf.model_count; crmodel++)
     {
         if ((dungeon->owned_creatures_of_model[crmodel] > 0)
             && (crmodel != get_players_spectator_model(my_player_number)))
         {
-            int i;
-            for (i=0; i < num_breeds; i++)
+            TbBool found = false;
+            for (int i = 0; i < num_breeds; i++)
             {
                 if (breed_activities[i] == crmodel)
                 {
+                    found = true;
                     break;
                 }
             }
-            if (num_breeds == i)
+            if (!found)
             {
-                breed_activities[i] = crmodel;
+                changed = true;
+                breed_activities[num_breeds] = crmodel;
                 num_breeds++;
             }
         }
     }
+
     // Remove from breed activities
-    for (crmodel=1; crmodel < game.conf.crtr_conf.model_count; crmodel++)
+    for (crmodel = 1; crmodel < game.conf.crtr_conf.model_count; crmodel++)
     {
         if ((dungeon->owned_creatures_of_model[crmodel] <= 0)
           && (crmodel != get_players_special_digger_model(my_player_number)))
         {
-            int i;
-            for (i=0; i < num_breeds; i++)
+            for (int i = 0; i < num_breeds; i++)
             {
                 if (breed_activities[i] == crmodel)
                 {
                     for (; i < num_breeds-1;  i++) {
                         breed_activities[i] = breed_activities[i+1];
                     }
+                    changed = true;
                     num_breeds--;
                     breed_activities[i] = 0;
                     break;
@@ -1346,6 +1349,25 @@ void update_creatr_model_activities_list(void)
         }
         no_of_breeds_owned = num_breeds;
     }
+
+    // Reorder breed activities to ensure diggers are correctly positioned
+    if (changed || forced)
+    {
+        struct CreatureModelConfig* crconf;
+        ThingModel temp;
+        int write_idx = 1;
+        for (int i = 1; i < num_breeds; i++)
+        {
+            crconf = &game.conf.crtr_conf.model[breed_activities[i]];
+            if (any_flag_is_set(crconf->model_flags, (CMF_IsDiggingCreature | CMF_IsSpecDigger)))
+            {
+                temp = breed_activities[i];
+                memmove(&breed_activities[write_idx + 1], &breed_activities[write_idx], (i - write_idx) * sizeof(ThingModel));
+                breed_activities[write_idx] = temp;
+                write_idx++;
+            }
+        }
+    }
 }
 
 void toggle_hero_health_flowers(void)