X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;ds=sidebyside;f=src%2Fserver%2Fai.c;h=91a6c8618c918e7eaf925085b1c288f2f5f638da;hb=3dce2a1d9dd93db625c81b09309d9ae0b612dbbb;hp=1596d5ae1915d600712ed99657e2e0bffd563dcc;hpb=4266e8b48fc5481ce24c0bf02fdd517217f8390a;p=plomrogue diff --git a/src/server/ai.c b/src/server/ai.c index 1596d5a..91a6c86 100644 --- a/src/server/ai.c +++ b/src/server/ai.c @@ -5,9 +5,10 @@ #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 "field_of_view.h" /* HIDDEN */ +#include "hardcoded_strings.h" /* s */ +#include "thing_actions.h" /* get_thing_action_id_by_name() */ +#include "things.h" /* struct Thing */ #include "world.h" /* global world */ @@ -26,39 +27,37 @@ static void get_neighbor_scores(uint16_t * score_map, uint16_t pos_i, /* Iterate over scored cells in "score_map" of world.map's geometry. Compare * 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 + * directions. If any neighbor's score is at least two points lower than the + * current cell's score, re-set it to 1 point higher than its lowest-scored * 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 or whose score is greater than - * "max_score". Expect "max_score" to be the maximum score for cells, marking - * them as unreachable. + * final score. Ignore cells 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 visible to "mo_origin". If no enemy is around, return 0. + * shortest path visible to "t_origin". If no enemy is around, return 0. */ -static char get_dir_to_nearest_enemy(struct MapObj * mo_origin); +static char get_dir_to_nearest_enemy(struct Thing * thing_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) { @@ -66,11 +65,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) { @@ -78,7 +77,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]; } } @@ -86,8 +85,9 @@ 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; - uint16_t pos, i_scans, neighbors[N_DIRS], min_neighbor; + uint32_t map_size = world.map.length * world.map.length; + uint32_t pos; + uint16_t i_scans, neighbors[N_DIRS], min_neighbor; uint8_t scores_still_changing = 1; uint8_t i_dirs; for (i_scans = 0; scores_still_changing; i_scans++) @@ -95,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] && score_map[pos] <= max_score) + if (score_map[pos] <= max_score) { get_neighbor_scores(score_map, pos, max_score, neighbors); min_neighbor = max_score; @@ -118,36 +118,44 @@ static void dijkstra_map(uint16_t * score_map, uint16_t max_score) -static char get_dir_to_nearest_enemy(struct MapObj * mo_origin) +static char get_dir_to_nearest_enemy(struct Thing * t_origin) { - char * f_name = "get_dir_to_nearest_enemy()"; - - /* 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.) + /* Calculate for each cell distance to visibly nearest enemy, with movement + * possible in the directions or "dir". (Actor's own cells start with 0 + * distance towards themselves. Cells of actors of own type are invisible.) */ - uint32_t map_size = world.map.size.y * world.map.size.x; + 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); + uint16_t * score_map = try_malloc(map_size * sizeof(uint16_t), __func__); uint32_t i; for (i = 0; i < map_size; i++) { - score_map[i] = mo_origin->fov_map[i] & VISIBLE ? max_score : UINT16_MAX; + score_map[i] = UINT16_MAX; + if ('.' == t_origin->mem_map[i]) + { + score_map[i] = max_score; + } } - struct MapObj * mo = world.map_objs; - for (; mo != NULL; mo = mo->next) + struct Thing * t = world.things; + for (; t != NULL; t = t->next) { - if (!mo->lifepoints || mo == mo_origin) + if ( !t->lifepoints || t == t_origin + || HIDDEN == t_origin->fov_map[t->pos.y*world.map.length+t->pos.x]) { continue; } - score_map[(mo->pos.y * world.map.size.x) + mo->pos.x] = 0; + if (t->lifepoints && t->type == t_origin->type) + { + score_map[t->pos.y * world.map.length + t->pos.x] = UINT16_MAX; + continue; + } + score_map[t->pos.y * world.map.length + t->pos.x] = 0; } dijkstra_map(score_map, max_score); - /* Return direction of "mo_origin"'s lowest-scored neighbor cell. */ + /* Return direction of "t_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 = (t_origin->pos.y * world.map.length) + t_origin->pos.x; get_neighbor_scores(score_map, pos_i, max_score, neighbors); free(score_map); char dir_to_nearest_enemy = 0; @@ -166,13 +174,13 @@ static char get_dir_to_nearest_enemy(struct MapObj * mo_origin) -extern void ai(struct MapObj * mo) +extern void ai(struct Thing * t) { - mo->command = get_moa_id_by_name("wait"); - char sel = get_dir_to_nearest_enemy(mo); - if (0 != sel) - { - mo->command = get_moa_id_by_name("move"); - mo->arg = sel; + t->command = get_thing_action_id_by_name(s[S_CMD_WAIT]); + char sel = t->fov_map ? get_dir_to_nearest_enemy(t) : 0;/* t->fov_map may */ + if (0 != sel) /* be absent due */ + { /* to god command.*/ + t->command = get_thing_action_id_by_name(s[S_CMD_MOVE]); + t->arg = sel; } }