X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=roguelike.c;h=e7ece3a0a58601b8d99a22b40ec1a10959e28422;hb=ed160c85898e726c7daf6b329f5e807e760ba3ed;hp=9fb9d31142d69a292ea5175603bfd2d0cc3e8dbc;hpb=9e3e8456a3a835d786566de40f17c3ffcde4e929;p=plomrogue diff --git a/roguelike.c b/roguelike.c index 9fb9d31..e7ece3a 100644 --- a/roguelike.c +++ b/roguelike.c @@ -10,6 +10,7 @@ struct World { int turn; char * log; struct Map * map; + struct Monster * monster; struct Player * player; }; struct KeyBinding { @@ -32,6 +33,10 @@ struct Player { int y; int x; }; +struct Monster { + int y; + int x; }; + void draw_with_linebreaks (struct Win *, char *, int); void draw_text_from_bottom (struct Win *, char *); void draw_log (struct Win *); @@ -41,13 +46,17 @@ void draw_keys_window (struct Win *); void toggle_window (struct WinMeta *, struct Win *); void init_keybindings(struct World *); struct Map init_map (); -void update_info (struct World *); +void map_scroll (struct Map *, char); +void next_turn (struct World *); void update_log (struct World *, char *); void save_keybindings(struct World *); int get_action_key (struct KeyBinding *, char *); char * get_keyname(int); +void keyswin_mod_key (struct World *, struct WinMeta *); +void keyswin_move_selection (struct World *, char); char is_passable (struct World *, int, int); void move_player (struct World *, char); +void player_wait(struct World *); void draw_with_linebreaks (struct Win * win, char * text, int start_y) { // Write text into window content space. Start on row start_y. Fill unused rows with whitespace. @@ -116,6 +125,7 @@ void draw_map (struct Win * win) { struct World * world = (struct World *) win->data; struct Map * map = world->map; struct Player * player = world->player; + struct Monster * monster = world->monster; char * cells = map->cells; int width_map_av = map->width - map->offset_x; int height_map_av = map->height - map->offset_y; @@ -126,6 +136,8 @@ void draw_map (struct Win * win) { if (y < height_map_av && x < width_map_av) { if (z == (map->width * player->y) + player->x) mvwaddch(win->curses, y, x, '@'); + else if (z == (map->width * monster->y) + monster->x) + mvwaddch(win->curses, y, x, 'M'); else mvwaddch(win->curses, y, x, cells[z]); z++; } } } } @@ -219,23 +231,55 @@ void init_keybindings(struct World * world) { struct Map init_map () { // Initialize map with some experimental start values. struct Map map; - map.width = 128; - map.height = 128; + map.width = 96; + map.height = 32; map.offset_x = 0; map.offset_y = 0; map.cells = malloc(map.width * map.height); - int x, y; + int x, y, ran; + char terrain; for (y = 0; y < map.height; y++) - for (x = 0; x < map.width; x++) - map.cells[(y * map.width) + x] = '.'; - map.cells[(5 * map.width) + 5] = 'X'; - map.cells[(3 * map.width) + 8] = 'X'; - map.cells[(8 * map.width) + 3] = 'X'; + for (x = 0; x < map.width; x++) { + terrain = '.'; + ran = rand(); + if ( 0 == ran % ((x*x) / 3 + 1) + || 0 == ran % ((y*y) / 3 + 1) + || 0 == ran % ((map.width - x - 1) * (map.width - x - 1) / 3 + 1) + || 0 == ran %((map.height - y - 1) * (map.height - y - 1) / 3 + 1)) + terrain = ' '; + map.cells[(y * map.width) + x] = terrain; } return map; } -void update_info (struct World * world) { -// Update info data by incrementing turn value. - world->turn++; } +void map_scroll (struct Map * map, char dir) { +// Scroll map into direction dir if possible by changing the offset. + if ('n' == dir && map->offset_y > 0) + map->offset_y--; + else if ('s' == dir) + map->offset_y++; + else if ('w' == dir && map->offset_x > 0) + map->offset_x--; + else if ('e' == dir) + map->offset_x++; } + +void next_turn (struct World * world) { +// Increment turn and move enemy. + world->turn++; + char d = rand() % 5; + char ty = world->monster->y; + char tx = world->monster->x; + if (1 == d) + ty++; + else if (2 == d) + ty--; + else if (3 == d) + tx++; + else if (4 == d) + tx--; + if (tx == world->player->x && ty == world->player->y) + update_log(world, "\nThe monster hits you."); + else if (is_passable(world, tx, ty)) { + world->monster->y = ty; + world->monster->x = tx; } } void update_log (struct World * world, char * text) { // Update log with new text to be appended. @@ -317,7 +361,23 @@ char * get_keyname(int keycode) { sprintf(keyname, "(unknown)"); return keyname; } -char is_passable (struct World * world, int y, int x) { +void keyswin_mod_key (struct World * world, struct WinMeta * win_meta) { +// In keybindings window, mark selection modifiable, modify key. Ensure max of three digits in key code field. + world->keyswindata->edit = 1; + draw_all_windows (win_meta); + int key = getch(); + if (key < 1000) + world->keybindings[world->keyswindata->select].key = key; + world->keyswindata->edit = 0; } + +void keyswin_move_selection (struct World * world, char dir) { +// In keybindings window, move selection upwards or downwards (if within limits of list length). + if ('u' == dir && world->keyswindata->select > 0) + world->keyswindata->select--; + else if ('d' == dir && world->keyswindata->select < world->keyswindata->max) + world->keyswindata->select++; } + +char is_passable (struct World * world, int x, int y) { // Check if coordinate on (or beyond) map is accessible to movement. char passable = 0; if (0 <= x && x < world->map->width && 0 <= y && y < world->map->height) @@ -330,38 +390,46 @@ void move_player (struct World * world, char d) { static char prev = 0; char success = 0; char * dir; + char ty = world->player->y; + char tx = world->player->x; if ('s' == d) { dir = "south"; - if (is_passable(world, world->player->x, world->player->y + 1)) { - world->player->y++; - success = 1; } } - else if ('n' == d) { + ty++; } + if ('n' == d) { dir = "north"; - if (is_passable(world, world->player->x, world->player->y - 1)) { - world->player->y--; - success = 1; } } - else if ('w' == d) { + ty--; } + if ('w' == d) { dir = "west"; - if (is_passable(world, world->player->x - 1, world->player->y)) { - world->player->x--; - success = 1; } } - else if ('e' == d) { + tx--; } + if ('e' == d) { dir = "east"; - if (is_passable(world, world->player->x + 1, world->player->y)) { - world->player->x++; - success = 1; } } + tx++; } + if (ty == world->monster->y && tx == world->monster->x) + success = 2; + else if (is_passable(world, tx, ty)) { + success = 1; + world->player->y = ty; + world->player->x = tx; } if (success * d == prev) update_log (world, "."); else { - char * msg = calloc(25, sizeof(char)); - char * msg_content = "You fail to move"; - if (success) - msg_content = "You move"; - sprintf(msg, "\n%s %s.", msg_content, dir); - update_log (world, msg); - free(msg); } + if (2 == success) + update_log (world, "\nYou hit the monster."); + else { + char * msg = calloc(25, sizeof(char)); + char * msg_content = "You fail to move"; + if (1 == success) + msg_content = "You move"; + sprintf(msg, "\n%s %s.", msg_content, dir); + update_log (world, msg); + free(msg); } } prev = success * d; - update_info (world); } + next_turn (world); } + +void player_wait(struct World * world) { +// Make player wait one turn. + next_turn (world); + update_log (world, "\nYou wait."); } int main () { struct World world; @@ -372,9 +440,13 @@ int main () { struct Map map = init_map(); world.map = ↦ struct Player player; - player.y = 2; - player.x = 2; + player.y = 16; + player.x = 16; world.player = &player; + struct Monster monster; + monster.y = 16; + monster.x = 80; + world.monster = &monster; WINDOW * screen = initscr(); noecho(); @@ -403,9 +475,9 @@ int main () { if (key == get_action_key(world.keybindings, "quit")) break; else if (key == get_action_key(world.keybindings, "scroll pad right")) - win_meta.pad_offset++; - else if (key == get_action_key(world.keybindings, "scroll pad left") && win_meta.pad_offset > 0) - win_meta.pad_offset--; + scroll_pad (&win_meta, '+'); + else if (key == get_action_key(world.keybindings, "scroll pad left")) + scroll_pad (&win_meta, '-'); else if (key == get_action_key(world.keybindings, "toggle keys window")) toggle_window(&win_meta, &win_keys); else if (key == get_action_key(world.keybindings, "toggle map window")) @@ -414,13 +486,13 @@ int main () { toggle_window(&win_meta, &win_info); else if (key == get_action_key(world.keybindings, "toggle log window")) toggle_window(&win_meta, &win_log); - else if (key == get_action_key(world.keybindings, "cycle forwards") && win_meta.active != 0) + else if (key == get_action_key(world.keybindings, "cycle forwards")) cycle_active_window(&win_meta, 'n'); - else if (key == get_action_key(world.keybindings, "cycle backwards") && win_meta.active != 0) + else if (key == get_action_key(world.keybindings, "cycle backwards")) cycle_active_window(&win_meta, 'p'); - else if (key == get_action_key(world.keybindings, "shift forwards") && win_meta.active != 0) + else if (key == get_action_key(world.keybindings, "shift forwards")) shift_window(&win_meta, 'f'); - else if (key == get_action_key(world.keybindings, "shift backwards") && win_meta.active != 0) + else if (key == get_action_key(world.keybindings, "shift backwards")) shift_window(&win_meta, 'b'); else if (key == get_action_key(world.keybindings, "grow horizontally") && win_meta.active != 0) resize_window(&win_meta, '*'); @@ -432,25 +504,20 @@ int main () { resize_window(&win_meta, '-'); else if (key == get_action_key(world.keybindings, "save keys")) save_keybindings(&world); - else if (key == get_action_key(world.keybindings, "keys nav up") && world.keyswindata->select > 0) - world.keyswindata->select--; - else if (key == get_action_key(world.keybindings, "keys nav down") && world.keyswindata->select < world.keyswindata->max) - world.keyswindata->select++; - else if (key == get_action_key(world.keybindings, "keys mod")) { - world.keyswindata->edit = 1; - draw_all_windows (&win_meta); - key = getch(); - if (key < 1000) // ensure maximum of three digits in key code field - world.keybindings[world.keyswindata->select].key = key; - world.keyswindata->edit = 0; } - else if (key == get_action_key(world.keybindings, "map up") && map.offset_y > 0) - map.offset_y--; + else if (key == get_action_key(world.keybindings, "keys nav up")) + keyswin_move_selection (&world, 'u'); + else if (key == get_action_key(world.keybindings, "keys nav down")) + keyswin_move_selection (&world, 'd'); + else if (key == get_action_key(world.keybindings, "keys mod")) + keyswin_mod_key (&world, &win_meta); + else if (key == get_action_key(world.keybindings, "map up")) + map_scroll (&map, 'n'); else if (key == get_action_key(world.keybindings, "map down")) - map.offset_y++; + map_scroll (&map, 's'); else if (key == get_action_key(world.keybindings, "map right")) - map.offset_x++; - else if (key == get_action_key(world.keybindings, "map left") && map.offset_x > 0) - map.offset_x--; + map_scroll (&map, 'e'); + else if (key == get_action_key(world.keybindings, "map left")) + map_scroll (&map, 'w'); else if (key == get_action_key(world.keybindings, "player down")) move_player(&world, 's'); else if (key == get_action_key(world.keybindings, "player up")) @@ -459,9 +526,8 @@ int main () { move_player(&world, 'e'); else if (key == get_action_key(world.keybindings, "player left")) move_player(&world, 'w'); - else if (key == get_action_key(world.keybindings, "wait") ) { - update_info (&world); - update_log (&world, "\nYou wait."); } } + else if (key == get_action_key(world.keybindings, "wait") ) + player_wait (&world); } free(map.cells); for (key = 0; key <= world.keyswindata->max; key++)