X-Git-Url: https://plomlompom.com/repos/index.html?a=blobdiff_plain;f=roguelike.c;h=89b64624036ebd5f16ae0256d46f27a90482e5d0;hb=891ff33aec8906fe8203910a26c56650ce74b904;hp=396f1f6afa8fabcc3309d1503cf09a500e90f5bb;hpb=705543203cfdd050e05c710d6daa1ff642668aa9;p=plomrogue
diff --git a/roguelike.c b/roguelike.c
index 396f1f6..89b6462 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 *);
@@ -39,15 +44,20 @@ void draw_map (struct Win *);
void draw_info (struct Win *);
void draw_keys_window (struct Win *);
void toggle_window (struct WinMeta *, struct Win *);
+void growshrink_active_window (struct WinMeta *, char);
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 +126,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 +137,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++; } } } }
@@ -180,6 +193,21 @@ void toggle_window (struct WinMeta * win_meta, struct Win * win) {
else
append_window(win_meta, win); }
+void growshrink_active_window (struct WinMeta * win_meta, char change) {
+// Grow or shrink active window horizontally or vertically by one cell size.
+ if (0 != win_meta->active) {
+ int height = win_meta->active->height;
+ int width = win_meta->active->width;
+ if (change == '-')
+ height--;
+ else if (change == '+')
+ height++;
+ else if (change == '_')
+ width--;
+ else if (change == '*')
+ width++;
+ resize_active_window (win_meta, height, width); } }
+
void init_keybindings(struct World * world) {
// Initialize keybindings from file "keybindings".
FILE * file = fopen("keybindings", "r");
@@ -238,9 +266,36 @@ struct Map init_map () {
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.
@@ -322,6 +377,22 @@ char * get_keyname(int keycode) {
sprintf(keyname, "(unknown)");
return keyname; }
+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;
@@ -335,38 +406,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;
@@ -377,9 +456,13 @@ int main () {
struct Map map = init_map();
world.map = ↦
struct Player player;
- player.y = 10;
- player.x = 10;
+ 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();
@@ -408,9 +491,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"))
@@ -419,43 +502,38 @@ 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)
- shift_window(&win_meta, 'f');
- else if (key == get_action_key(world.keybindings, "shift backwards") && win_meta.active != 0)
- shift_window(&win_meta, 'b');
- else if (key == get_action_key(world.keybindings, "grow horizontally") && win_meta.active != 0)
- resize_window(&win_meta, '*');
- else if (key == get_action_key(world.keybindings, "shrink horizontally") && win_meta.active != 0)
- resize_window(&win_meta, '_');
- else if (key == get_action_key(world.keybindings, "grow vertically") && win_meta.active != 0)
- resize_window(&win_meta, '+');
- else if (key == get_action_key(world.keybindings, "shrink vertically") && win_meta.active != 0)
- resize_window(&win_meta, '-');
+ else if (key == get_action_key(world.keybindings, "shift forwards"))
+ shift_active_window(&win_meta, 'f');
+ else if (key == get_action_key(world.keybindings, "shift backwards"))
+ shift_active_window(&win_meta, 'b');
+ else if (key == get_action_key(world.keybindings, "grow horizontally"))
+ growshrink_active_window(&win_meta, '*');
+ else if (key == get_action_key(world.keybindings, "shrink horizontally"))
+ growshrink_active_window(&win_meta, '_');
+ else if (key == get_action_key(world.keybindings, "grow vertically"))
+ growshrink_active_window(&win_meta, '+');
+ else if (key == get_action_key(world.keybindings, "shrink vertically"))
+ growshrink_active_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"))
@@ -464,9 +542,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++)