X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/copy_free?a=blobdiff_plain;f=src%2Fserver%2Fai.c;h=ea77dd48e740e79bf4dd67a9a0a4d629368bb4d7;hb=273161a3d8956e98308a79169dcf7c70a89992fe;hp=9c31153c40595180c5db22d89ee725e654c7de98;hpb=6b1d36c9e673fd8f8595119080dca63a39ba483b;p=plomrogue diff --git a/src/server/ai.c b/src/server/ai.c index 9c31153..ea77dd4 100644 --- a/src/server/ai.c +++ b/src/server/ai.c @@ -5,6 +5,7 @@ #include /* uint8_t, uint16_t, uint32_t, UINT16_MAX */ #include /* free() */ #include "../common/try_malloc.h" /* try_malloc() */ +#include "field_of_view.h" /* VISIBLE */ #include "map_object_actions.h" /* get_moa_id_by_name() */ #include "map_objects.h" /* struct MapObj */ #include "world.h" /* global world */ @@ -27,15 +28,16 @@ static void get_neighbor_scores(uint16_t * score_map, uint16_t pos_i, * each cell's score against the score of its immediate neighbors in N_DIRS * directions. If it's neighbors are low enough that the result would be lower * than the current value, re-set it to 1 point higher than its lowest-scored - * neighbor- Repeat this whole process until all cells have settled on their + * neighbor. Repeat this whole process until all cells have settled on their * final score. Ignore cells whose position in "score_map" fits cells of - * unreachable terrain in world.map.cells. Expect "max_score" to be the maximum - * score for cells, marking them as unreachable. + * unreachable terrain in world.map.cells or whose score is greater than + * "max_score". Expect "max_score" to be the maximum score for cells, marking + * them as unreachable. */ static void dijkstra_map(uint16_t * score_map, uint16_t max_score); /* Return numpad char of direction ("8", "6", "2", "4" etc.) of enemy with the - * shortest path to "mo_origin". If no enemy is around, return 0. + * shortest path visible to "mo_origin". If no enemy is around, return 0. */ static char get_dir_to_nearest_enemy(struct MapObj * mo_origin); @@ -44,19 +46,19 @@ static char get_dir_to_nearest_enemy(struct MapObj * mo_origin); static void get_neighbor_scores(uint16_t * score_map, uint16_t pos_i, uint16_t max_score, uint16_t * neighbors) { - uint32_t map_size = world.map.size.y * world.map.size.x; + uint32_t map_size = world.map.length * world.map.length; uint8_t i_dir; for (i_dir = 0; i_dir < N_DIRS; neighbors[i_dir] = max_score, i_dir++); - uint8_t open_north = pos_i >= world.map.size.x; - uint8_t open_east = pos_i + 1 % world.map.size.x; - uint8_t open_south = pos_i + world.map.size.x < map_size; - uint8_t open_west = pos_i % world.map.size.x; - uint8_t is_indented = (pos_i / world.map.size.x) % 2; + uint8_t open_north = pos_i >= world.map.length; + uint8_t open_east = pos_i + 1 % world.map.length; + uint8_t open_south = pos_i + world.map.length < map_size; + uint8_t open_west = pos_i % world.map.length; + uint8_t is_indented = (pos_i / world.map.length) % 2; uint8_t open_diag_west = is_indented || open_west; uint8_t open_diag_east = !is_indented || open_east; if (open_north && open_diag_east) { - neighbors[0] = score_map[pos_i - world.map.size.x + is_indented]; + neighbors[0] = score_map[pos_i - world.map.length + is_indented]; } if (open_east) { @@ -64,11 +66,11 @@ static void get_neighbor_scores(uint16_t * score_map, uint16_t pos_i, } if (open_south && open_diag_east) { - neighbors[2] = score_map[pos_i + world.map.size.x + is_indented]; + neighbors[2] = score_map[pos_i + world.map.length + is_indented]; } if (open_south && open_diag_west) { - neighbors[3] = score_map[pos_i + world.map.size.x - !is_indented]; + neighbors[3] = score_map[pos_i + world.map.length - !is_indented]; } if (open_west) { @@ -76,7 +78,7 @@ static void get_neighbor_scores(uint16_t * score_map, uint16_t pos_i, } if (open_north && open_diag_west) { - neighbors[5] = score_map[pos_i - world.map.size.x - !is_indented]; + neighbors[5] = score_map[pos_i - world.map.length - !is_indented]; } } @@ -84,7 +86,7 @@ static void get_neighbor_scores(uint16_t * score_map, uint16_t pos_i, static void dijkstra_map(uint16_t * score_map, uint16_t max_score) { - uint32_t map_size = world.map.size.y * world.map.size.x; + uint32_t map_size = world.map.length * world.map.length; uint16_t pos, i_scans, neighbors[N_DIRS], min_neighbor; uint8_t scores_still_changing = 1; uint8_t i_dirs; @@ -93,7 +95,7 @@ static void dijkstra_map(uint16_t * score_map, uint16_t max_score) scores_still_changing = 0; for (pos = 0; pos < map_size; pos++) { - if ('.' == world.map.cells[pos]) + if ('.' == world.map.cells[pos] && score_map[pos] <= max_score) { get_neighbor_scores(score_map, pos, max_score, neighbors); min_neighbor = max_score; @@ -120,17 +122,17 @@ static char get_dir_to_nearest_enemy(struct MapObj * mo_origin) { char * f_name = "get_dir_to_nearest_enemy()"; - /* Calculate for each cell the distance to the nearest map actor that is - * not "mo_origin", with movement only possible in the directions of "dir". + /* Calculate for each cell the distance to the visibly nearest map actor not + * "mo_origin", with movement only possible in the directions of "dir". * (Actors' own cells start with a distance of 0 towards themselves.) */ - uint32_t map_size = world.map.size.y * world.map.size.x; - uint16_t max_score = UINT16_MAX; + uint32_t map_size = world.map.length * world.map.length; + uint16_t max_score = UINT16_MAX - 1; uint16_t * score_map = try_malloc(map_size * sizeof(uint16_t), f_name); uint32_t i; for (i = 0; i < map_size; i++) { - score_map[i] = max_score; + score_map[i] = mo_origin->fov_map[i] & VISIBLE ? max_score : UINT16_MAX; } struct MapObj * mo = world.map_objs; for (; mo != NULL; mo = mo->next) @@ -139,13 +141,13 @@ static char get_dir_to_nearest_enemy(struct MapObj * mo_origin) { continue; } - score_map[(mo->pos.y * world.map.size.x) + mo->pos.x] = 0; + score_map[(mo->pos.y * world.map.length) + mo->pos.x] = 0; } dijkstra_map(score_map, max_score); /* Return direction of "mo_origin"'s lowest-scored neighbor cell. */ uint16_t neighbors[N_DIRS]; - uint16_t pos_i = (mo_origin->pos.y * world.map.size.x) + mo_origin->pos.x; + uint16_t pos_i = (mo_origin->pos.y * world.map.length) + mo_origin->pos.x; get_neighbor_scores(score_map, pos_i, max_score, neighbors); free(score_map); char dir_to_nearest_enemy = 0;