From: Christian Heller Date: Sun, 1 Nov 2020 03:21:37 +0000 (+0100) Subject: Add player name visibility via study mode. X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/%7B%7B%20web_path%20%7D%7D/static/template?a=commitdiff_plain;h=81554cf96856befe1392d86efcebb25e997e3497;p=plomrogue2-experiments Add player name visibility via study mode. --- diff --git a/new2/plomrogue/game.py b/new2/plomrogue/game.py index e871d59..2202343 100755 --- a/new2/plomrogue/game.py +++ b/new2/plomrogue/game.py @@ -86,6 +86,9 @@ class Game(GameBase): def send_thing(thing): self.io.send('THING_POS %s %s' % (thing.id_, t.position)) + if hasattr(thing, 'nickname'): + self.io.send('THING_NAME %s %s' % (thing.id_, t.nickname)) + self.io.send('TURN ' + str(self.turn)) for t in self.things: diff --git a/new2/rogue_chat_nocanvas_monochrome.html b/new2/rogue_chat_nocanvas_monochrome.html index 583b2dc..37930ce 100644 --- a/new2/rogue_chat_nocanvas_monochrome.html +++ b/new2/rogue_chat_nocanvas_monochrome.html @@ -133,6 +133,12 @@ let parser = { }, } +class Thing { + constructor(yx) { + this.position = yx; + } +} + let server = { init: function(url) { this.url = url; @@ -165,7 +171,9 @@ let server = { game.portals = {}; game.turn = parseInt(tokens[1]); } else if (tokens[0] === 'THING_POS') { - game.things[tokens[1]] = parser.parse_yx(tokens[2]); + game.get_thing(tokens[1], true).position = parser.parse_yx(tokens[2]); + } else if (tokens[0] === 'THING_NAME') { + game.get_thing(tokens[1], true).name_ = tokens[2]; } else if (tokens[0] === 'MAP') { game.map_size = parser.parse_yx(tokens[1]); game.map = tokens[2] @@ -174,15 +182,9 @@ let server = { if (tui.mode == mode_study) { explorer.query_info(); } - let player_position = [0,0]; - for (const thing_id in game.things) { - if (game.player_id == thing_id) { - let t = game.things[thing_id]; - player_position = t; - } - } - if (player_position in game.portals) { - tui.teleport_target = game.portals[player_position]; + let t = game.get_thing(game.player_id); + if (t.position in game.portals) { + tui.teleport_target = game.portals[t.position]; tui.switch_mode(mode_teleport); return; } @@ -297,7 +299,7 @@ let tui = { }, switch_mode: function(mode, keep_pos=false) { if (mode == mode_study && !keep_pos) { - explorer.position = game.things[game.player_id]; + explorer.position = game.things[game.player_id].position; } this.mode = mode; this.empty_input(); @@ -388,9 +390,9 @@ let tui = { Math.floor(game.map_size[1] / 2)]; for (const thing_id in game.things) { let t = game.things[thing_id]; - map_lines[t[0]][t[1]] = '@'; + map_lines[t.position[0]][t.position[1]] = '@'; if (game.player_id == thing_id) { - center_pos = t; + center_pos = t.position; } }; if (tui.mode.shows_info) { @@ -468,6 +470,15 @@ let game = { this.player_id = -1; this.portals = {}; }, + get_thing: function(id_, create_if_not_found=false) { + if (id_ in game.things) { + return game.things[id_]; + } else if (create_if_not_found) { + let t = new Thing([0,0]); + game.things[id_] = t; + return t; + }; + } } game.init(); @@ -517,6 +528,16 @@ let explorer = { }, get_info: function() { let info = ""; + for (let t_id in game.things) { + let t = game.things[t_id]; + if (t.position[0] == this.position[0] && t.position[1] == this.position[1]) { + info += "PLAYER"; + if (t.name_) { + info += " " + t.name_; + } + info += "\n"; + } + } if (this.position in game.portals) { info += "PORTAL: " + game.portals[this.position] + "\n"; }