From: Christian Heller Date: Tue, 27 Oct 2020 04:48:54 +0000 (+0100) Subject: Allow annotations. X-Git-Url: https://plomlompom.com/repos/%7B%7Bdb.prefix%7D%7D/%7B%7B%20web_path%20%7D%7D/static/git-favicon.png?a=commitdiff_plain;h=beebfdb7dac8e7630643c44e9ae8d3c79d5d39d8;p=plomrogue2-experiments Allow annotations. --- diff --git a/new2/plomrogue/commands.py b/new2/plomrogue/commands.py index 861aa64..9e67ce0 100644 --- a/new2/plomrogue/commands.py +++ b/new2/plomrogue/commands.py @@ -49,11 +49,28 @@ def cmd_TURN(game, n): game.turn = n cmd_TURN.argtypes = 'int:nonneg' +#def cmd_ANNOTATE(game, yx, connection_id): +def cmd_ANNOTATE(game, yx, msg): + if msg == ' ': + if yx in game.annotations: + del game.annotations[yx] + else: + game.annotations[yx] = msg + game.changed = True +cmd_ANNOTATE.argtypes = 'yx_tuple:nonneg string' + +def cmd_GET_ANNOTATION(game, yx, connection_id): + annotation = '(none)'; + if yx in game.annotations: + annotation = game.annotations[yx] + game.io.send('ANNOTATION %s %s' % (yx, quote(annotation))) +cmd_GET_ANNOTATION.argtypes = 'yx_tuple:nonneg' + # TODO: disallow these commands from clients? (maybe by failing on connection_id?) def cmd_MAP_LINE(game, y, line): game.map.set_line(y, line) cmd_MAP_LINE.argtypes = 'int:nonneg string' def cmd_MAP(game, size): - game.new_map(size) + game.new_world(size) cmd_MAP.argtypes = 'yx_tuple:pos' diff --git a/new2/plomrogue/game.py b/new2/plomrogue/game.py index 8fb2644..74c79d1 100755 --- a/new2/plomrogue/game.py +++ b/new2/plomrogue/game.py @@ -2,7 +2,8 @@ from plomrogue.tasks import (Task_WAIT, Task_MOVE, Task_WRITE, Task_FLATTEN_SURROUNDINGS) from plomrogue.errors import GameError from plomrogue.commands import (cmd_ALL, cmd_LOGIN, cmd_QUERY, cmd_PING, - cmd_TURN, cmd_MAP_LINE, cmd_MAP) + cmd_TURN, cmd_MAP_LINE, cmd_MAP, cmd_GET_ANNOTATION, + cmd_ANNOTATE) from plomrogue.io import GameIO from plomrogue.misc import quote from plomrogue.things import Thing, ThingPlayer @@ -48,12 +49,15 @@ class Game(GameBase): 'LOGIN': cmd_LOGIN, 'TURN': cmd_TURN, 'MAP_LINE': cmd_MAP_LINE, + 'GET_ANNOTATION': cmd_GET_ANNOTATION, + 'ANNOTATE': cmd_ANNOTATE, 'MAP': cmd_MAP, 'PING': cmd_PING} self.thing_type = Thing self.thing_types = {'player': ThingPlayer} self.sessions = {} self.map = Map(self.map_geometry.size) + self.annotations = {} if os.path.exists(self.io.save_file): if not os.path.isfile(self.io.save_file): raise GameError('save file path refers to non-file') @@ -163,7 +167,10 @@ class Game(GameBase): write(f, 'MAP %s' % (self.map_geometry.size,)) for y, line in self.map.lines(): write(f, 'MAP_LINE %5s %s' % (y, quote(line))) + for yx in self.annotations: + write(f, 'ANNOTATE %s %s' % (yx, quote(self.annotations[yx]))) - def new_map(self, size): + def new_world(self, size): self.map_geometry = MapGeometrySquare(YX(size.y, size.x)) self.map = Map(self.map_geometry.size) + self.annotations = {} diff --git a/new2/plomrogue/parser.py b/new2/plomrogue/parser.py index b350ee5..5782d69 100644 --- a/new2/plomrogue/parser.py +++ b/new2/plomrogue/parser.py @@ -106,6 +106,8 @@ class Parser: if not arg.isdigit(): raise ArgError('Argument must be non-negative integer.') args += [int(arg)] + elif tmpl == 'yx_tuple:nonneg': + args += [self.parse_yx_tuple(arg, 'nonneg')] elif tmpl == 'yx_tuple:pos': args += [self.parse_yx_tuple(arg, 'pos')] elif tmpl == string_string: diff --git a/new2/rogue_chat_nocanvas_monochrome.html b/new2/rogue_chat_nocanvas_monochrome.html index 3f907c0..863de8c 100644 --- a/new2/rogue_chat_nocanvas_monochrome.html +++ b/new2/rogue_chat_nocanvas_monochrome.html @@ -122,9 +122,11 @@ function quote(str) { let tui = { mode: 'chat', - switch_mode: function(mode_name) { - if (mode_name == 'explore') { - explorer.position = game.things[game.player_id]; + log: [], + input_line: '', + switch_mode: function(mode_name, keep_pos=false) { + if (mode_name == 'study' && !keep_pos) { + explorer.position = game.things[game.player_id]; } this.mode = mode_name; this.full_refresh(); @@ -132,7 +134,7 @@ let tui = { draw_history: function() { terminal.drawBox(1, terminal.cols / 2, terminal.rows - 2, terminal.cols / 2); let i = 0; - for (let line of chat.history) { + for (let line of this.log) { terminal.write(terminal.rows - 2 - i, terminal.cols / 2, line); i += 1; } @@ -159,7 +161,7 @@ let tui = { } }; let center_pos = player_position; - if (tui.mode == 'explore') { + if (tui.mode == 'study' || tui.mode == 'annotate') { map_lines[explorer.position[0]][explorer.position[1]] = '?'; center_pos = explorer.position; } @@ -180,22 +182,24 @@ let tui = { }, draw_input_line: function() { terminal.drawBox(terminal.rows - 1, terminal.cols / 2, 1, terminal.cols / 2); - terminal.write(terminal.rows - 1, terminal.cols / 2, chat.input_line); + if (this.mode == 'chat' || this.mode == 'annotate') { + terminal.write(terminal.rows - 1, terminal.cols / 2, '> ' + this.input_line); + } }, log_msg: function(msg) { let line_length = (terminal.cols / 2); let chunk = ""; for (let i = 0, x = 0; i < msg.length; i++, x++) { if (x >= line_length) { - chat.history.unshift(chunk); + this.log.unshift(chunk); chunk = ""; x = 0; }; chunk += msg[i]; } - chat.history.unshift(chunk); - while (chat.history.length > terminal.rows - 2) { - chat.history.pop(); + this.log.unshift(chunk); + while (this.log.length > terminal.rows - 2) { + this.log.pop(); }; this.draw_history(); }, @@ -217,25 +221,30 @@ let tui = { tui.log_msg("f - flatten surroundings"); tui.log_msg("e - write following ASCII character"); tui.log_msg("c - switch to chat mode"); - tui.log_msg("? - switch to explore mode"); + tui.log_msg("? - switch to investigation mode"); tui.log_msg(""); - tui.log_msg("explore mode commands:"); + tui.log_msg("investigation mode commands:"); tui.log_msg("w, a, s, d - move question mark"); + tui.log_msg("A - annotate terrain"); tui.log_msg("c - switch to chat mode"); tui.log_msg("p - switch to play mode"); tui.log_msg(""); }, draw_info: function() { - terminal.drawBox(0, terminal.cols / 2, terminal.rows, terminal.cols / 2); - let lines = ['unfinished info screen']; - for (let y = 0, i = 0; y < terminal.rows && i < lines.length; y++, i++) { + terminal.drawBox(1, terminal.cols / 2, terminal.rows - 2, terminal.cols / 2); + let lines = explorer.get_info(); + for (let y = 1, i = 0; y < terminal.rows && i < lines.length; y++, i++) { terminal.write(y, terminal.cols / 2, lines[i]); } }, full_refresh: function() { this.draw_map(); this.draw_turn_line(); - this.draw_history(); + if (this.mode == 'study' || this.mode == 'annotate') { + this.draw_info(); + } else { + this.draw_history(); + } this.draw_input_line(); this.refresh(); } @@ -249,11 +258,6 @@ let game = { player_id: 0 } -let chat = { - input_line: "", - history: [], -} - terminal.initialize(); tui.log_help(); tui.full_refresh(); @@ -270,6 +274,10 @@ websocket.onmessage = function (event) { game.map_size = parser.parse_yx(tokens[1]); game.map = tokens[2] } else if (tokens[0] === 'GAME_STATE_COMPLETE') { + explorer.empty_info_db(); + if (tui.mode == 'study') { + explorer.query_info(); + } tui.draw_turn_line(); tui.draw_map(); tui.refresh(); @@ -281,6 +289,9 @@ websocket.onmessage = function (event) { } else if (tokens[0] === 'META') { tui.log_msg('@ ' + tokens[1]); tui.refresh(); + } else if (tokens[0] === 'ANNOTATION') { + let position = parser.parse_yx(tokens[1]); + explorer.update_info_db(position, tokens[2]); } else if (tokens[0] === 'UNHANDLED_INPUT') { tui.log_msg('? unknown command'); tui.refresh(); @@ -300,6 +311,7 @@ websocket.onmessage = function (event) { let explorer = { position: [0,0], + info_db: {}, move: function(direction) { let try_pos = [0,0]; try_pos[0] = this.position[0]; @@ -318,30 +330,63 @@ let explorer = { !(try_pos[0] >= game.map_size[0]) && !(try_pos[1] >= game.map_size[1])) { this.position = try_pos; + this.query_info(); tui.draw_map(); tui.draw_info(); tui.refresh(); } + }, + update_info_db: function(yx, str) { + this.info_db[yx] = str; + if (tui.mode == 'study') { + tui.draw_info(); + tui.refresh(); + } + }, + empty_info_db: function() { + this.info_db = {}; + if (tui.mode == 'study') { + tui.draw_info(); + tui.refresh(); + } + }, + query_info: function() { + websocket.send("GET_ANNOTATION Y:" + explorer.position[0] + ",X:" + explorer.position[1]); + }, + get_info: function() { + if (this.position in this.info_db) { + return [this.info_db[this.position]]; + } else { + return ['waiting …']; + } + }, + annotate: function(msg) { + if (msg.length == 0) { + msg = " "; // triggers annotation deletion + } + websocket.send("ANNOTATE Y:" + explorer.position[0] + ",X:" + explorer.position[1] + " " + quote(msg)); } } document.addEventListener('keydown', (event) => { if (tui.mode == 'chat') { if (event.key.length === 1) { - chat.input_line += event.key; + tui.input_line += event.key; tui.draw_input_line(); tui.refresh(); } else if (event.key == 'Backspace') { - chat.input_line = chat.input_line.slice(0, -1); + tui.input_line = tui.input_line.slice(0, -1); tui.draw_input_line(); tui.refresh(); } else if (event.key == 'Enter') { - let [tokens, token_starts] = parser.tokenize(chat.input_line); + let [tokens, token_starts] = parser.tokenize(tui.input_line); if (tokens.length > 0 && tokens[0].length > 0) { if (tokens[0][0] == '/') { if (tokens[0] == '/play') { tui.switch_mode('play'); - } else if (tokens[0] == '/?') { + } else if (tokens[0] == '/study') { + tui.switch_mode('study'); + } else if (tokens[0] == '/help') { tui.log_help(); tui.refresh(); } else if (tokens[0] == '/login') { @@ -352,7 +397,7 @@ document.addEventListener('keydown', (event) => { } } else if (tokens[0] == '/msg') { if (tokens.length > 2) { - let msg = chat.input_line.slice(token_starts[2]); + let msg = tui.input_line.slice(token_starts[2]); websocket.send('QUERY ' + quote(tokens[1]) + ' ' + quote(msg)); } else { tui.log_msg('? need message target and message'); @@ -361,20 +406,20 @@ document.addEventListener('keydown', (event) => { tui.log_msg('? unknown command'); } } else { - websocket.send('ALL ' + quote(chat.input_line)); + websocket.send('ALL ' + quote(tui.input_line)); } } - chat.input_line = ''; + tui.input_line = ''; tui.draw_input_line(); tui.refresh(); } - } else if (tui.mode == 'play') { + } else if (tui.mode == 'play') { if (event.key === 'c') { tui.switch_mode('chat'); } else if (event.key === 'e') { tui.switch_mode('edit'); } else if (event.key === '?') { - tui.switch_mode('explore'); + tui.switch_mode('study'); } else if (event.key === 'F1') { tui.log_help(); tui.refresh(); @@ -394,7 +439,7 @@ document.addEventListener('keydown', (event) => { websocket.send("TASK:WRITE " + quote(event.key)); } tui.switch_mode('play'); - } else if (tui.mode == 'explore') { + } else if (tui.mode == 'study') { if (event.key === 'c') { tui.switch_mode('chat'); } else if (event.key == 'p') { @@ -407,7 +452,25 @@ document.addEventListener('keydown', (event) => { explorer.move('up'); } else if (event.key === 's') { explorer.move('down'); - }; + } else if (event.key === 'A') { + tui.switch_mode('annotate'); + tui.draw_info(); + tui.refresh(); + }; + } else if (tui.mode == 'annotate') { + if (event.key.length === 1) { + tui.input_line += event.key; + tui.draw_input_line(); + tui.refresh(); + } else if (event.key == 'Backspace') { + tui.input_line = tui.input_line.slice(0, -1); + tui.draw_input_line(); + tui.refresh(); + } else if (event.key == 'Enter') { + explorer.annotate(tui.input_line); + tui.input_line = ''; + tui.switch_mode('study', true); + } } }, false);