Add server teleportation and :reconnect commands.

diff --git a/new2/plomrogue/commands.py b/new2/plomrogue/commands.py
index 97001e0a313f294854eeed5165944418ad1e44e6..3741033be49af5ddaa44f803d072951186442243 100644 (file)
--- a/new2/plomrogue/commands.py
+++ b/new2/plomrogue/commands.py
@@ -69,6 +69,15 @@ def cmd_ANNOTATE(game, yx, msg, connection_id):
     game.changed = True
 cmd_ANNOTATE.argtypes = 'yx_tuple:nonneg string'
 
     game.changed = True
 cmd_ANNOTATE.argtypes = 'yx_tuple:nonneg string'
 

+def cmd_PORTAL(game, yx, msg, connection_id):
+    if msg == ' ':
+        if yx in game.portals:
+            del game.portals[yx]
+    else:
+        game.portals[yx] = msg
+    game.changed = True
+cmd_PORTAL.argtypes = 'yx_tuple:nonneg string'
+

 def cmd_GET_ANNOTATION(game, yx, connection_id):
     annotation = '(none)';
     if yx in game.annotations:
 def cmd_GET_ANNOTATION(game, yx, connection_id):
     annotation = '(none)';
     if yx in game.annotations:

diff --git a/new2/plomrogue/game.py b/new2/plomrogue/game.py
index d90aa0b0f8a47350536244d7f3fab39ffdb01fce..e871d59401f1a9418ccc97c5f6c7fd5a055dd58a 100755 (executable)
--- a/new2/plomrogue/game.py
+++ b/new2/plomrogue/game.py
@@ -3,7 +3,7 @@ from plomrogue.tasks import (Task_WAIT, Task_MOVE, Task_WRITE,
 from plomrogue.errors import GameError, PlayError
 from plomrogue.commands import (cmd_ALL, cmd_LOGIN, cmd_QUERY, cmd_PING,
                                 cmd_TURN, cmd_MAP_LINE, cmd_MAP, cmd_GET_ANNOTATION,
 from plomrogue.errors import GameError, PlayError
 from plomrogue.commands import (cmd_ALL, cmd_LOGIN, cmd_QUERY, cmd_PING,
                                 cmd_TURN, cmd_MAP_LINE, cmd_MAP, cmd_GET_ANNOTATION,

-                                cmd_ANNOTATE, cmd_GET_GAMESTATE)
+                                cmd_ANNOTATE, cmd_PORTAL, cmd_GET_GAMESTATE)

 from plomrogue.io import GameIO
 from plomrogue.misc import quote
 from plomrogue.things import Thing, ThingPlayer 
 from plomrogue.io import GameIO
 from plomrogue.misc import quote
 from plomrogue.things import Thing, ThingPlayer 


@@ -50,6 +50,7 @@ class Game(GameBase):
                          'TURN': cmd_TURN,
                          'MAP_LINE': cmd_MAP_LINE,
                          'GET_ANNOTATION': cmd_GET_ANNOTATION,
                          'TURN': cmd_TURN,
                          'MAP_LINE': cmd_MAP_LINE,
                          'GET_ANNOTATION': cmd_GET_ANNOTATION,

+                         'PORTAL': cmd_PORTAL,

                          'GET_GAMESTATE': cmd_GET_GAMESTATE,
                          'ANNOTATE': cmd_ANNOTATE,
                          'MAP': cmd_MAP,
                          'GET_GAMESTATE': cmd_GET_GAMESTATE,
                          'ANNOTATE': cmd_ANNOTATE,
                          'MAP': cmd_MAP,


@@ -59,6 +60,7 @@ class Game(GameBase):
         self.sessions = {}
         self.map = Map(self.map_geometry.size)
         self.annotations = {}
         self.sessions = {}
         self.map = Map(self.map_geometry.size)
         self.annotations = {}

+        self.portals = {}

         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')
         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')


@@ -89,6 +91,8 @@ class Game(GameBase):
         for t in self.things:
             send_thing(t)
         self.io.send('MAP %s %s' % (self.map_geometry.size, quote(self.map.terrain)))
         for t in self.things:
             send_thing(t)
         self.io.send('MAP %s %s' % (self.map_geometry.size, quote(self.map.terrain)))

+        for yx in self.portals:
+            self.io.send('PORTAL %s %s' % (yx, self.portals[yx]))

         self.io.send('GAME_STATE_COMPLETE')
 
     def run_tick(self):
         self.io.send('GAME_STATE_COMPLETE')
 
     def run_tick(self):


@@ -179,6 +183,8 @@ class Game(GameBase):
               write(f, 'MAP_LINE %5s %s' % (y, quote(line)))
           for yx in self.annotations:
               write(f, 'ANNOTATE %s %s' % (yx, quote(self.annotations[yx])))
               write(f, 'MAP_LINE %5s %s' % (y, quote(line)))
           for yx in self.annotations:
               write(f, 'ANNOTATE %s %s' % (yx, quote(self.annotations[yx])))

+          for yx in self.portals:
+              write(f, 'PORTAL %s %s' % (yx, self.portals[yx]))

 
     def new_world(self, size):
         self.map_geometry = MapGeometrySquare(YX(size.y, size.x))
 
     def new_world(self, size):
         self.map_geometry = MapGeometrySquare(YX(size.y, size.x))

diff --git a/new2/rogue_chat_nocanvas_monochrome.html b/new2/rogue_chat_nocanvas_monochrome.html
index de79177a73c020781d6ac48ad8701c4a4bb1c36c..578e971912e29ad52991b76d627afdd93da18eaa 100644 (file)
--- a/new2/rogue_chat_nocanvas_monochrome.html
+++ b/new2/rogue_chat_nocanvas_monochrome.html
@@ -143,17 +143,26 @@ let server = {
             tui.init_login();
         };
         this.websocket.onclose = function(event) {
             tui.init_login();
         };
         this.websocket.onclose = function(event) {

-            tui.log_msg('@ server disconnected :(');
+            tui.log_msg("@ server disconnected :(");
+            tui.log_msg("@ hint: try the ':reconnect' command");

         };
        this.websocket.onmessage = this.handle_event;
     },
         };
        this.websocket.onmessage = this.handle_event;
     },

+    reconnect: function() {
+       this.reconnect_to(this.url);
+    },
+    reconnect_to: function(url) {
+        this.websocket.close();
+        this.init(url);
+    },

     send: function(tokens) {
         this.websocket.send(unparser.untokenize(tokens));
     },
     handle_event: function(event) {
         let tokens = parser.tokenize(event.data)[0];
         if (tokens[0] === 'TURN') {
     send: function(tokens) {
         this.websocket.send(unparser.untokenize(tokens));
     },
     handle_event: function(event) {
         let tokens = parser.tokenize(event.data)[0];
         if (tokens[0] === 'TURN') {

-            game.things = {}
+            game.things = {};
+            game.portals = {};

             game.turn = parseInt(tokens[1]);
         } else if (tokens[0] === 'THING_POS') {
             game.things[tokens[1]] = parser.parse_yx(tokens[2]);
             game.turn = parseInt(tokens[1]);
         } else if (tokens[0] === 'THING_POS') {
             game.things[tokens[1]] = parser.parse_yx(tokens[2]);


@@ -165,6 +174,18 @@ let server = {
             if (tui.mode == mode_study) {
                 explorer.query_info();
             }
             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];
+                tui.switch_mode(mode_teleport);
+                return;
+            }

             tui.full_refresh();
         } else if (tokens[0] === 'CHAT') {
              tui.log_msg('# ' + tokens[1], 1);
             tui.full_refresh();
         } else if (tokens[0] === 'CHAT') {
              tui.log_msg('# ' + tokens[1], 1);


@@ -174,6 +195,9 @@ let server = {
             this.send(['GET_GAMESTATE']);
             tui.log_help();
             tui.switch_mode(mode_play);
             this.send(['GET_GAMESTATE']);
             tui.log_help();
             tui.switch_mode(mode_play);

+        } else if (tokens[0] === 'PORTAL') {
+            let position = parser.parse_yx(tokens[1]);
+            game.portals[position] = tokens[2];

         } else if (tokens[0] === 'ANNOTATION') {
             let position = parser.parse_yx(tokens[1]);
             explorer.update_info_db(position, tokens[2]);
         } else if (tokens[0] === 'ANNOTATION') {
             let position = parser.parse_yx(tokens[1]);
             explorer.update_info_db(position, tokens[2]);


@@ -233,6 +257,7 @@ let mode_annotate = new Mode('add message to map tile', true, true);
 let mode_play = new Mode('play / move around', false, false);
 let mode_study = new Mode('check map tiles for messages', false, true);
 let mode_edit = new Mode('write ASCII char to map tile', false, false);
 let mode_play = new Mode('play / move around', false, false);
 let mode_study = new Mode('check map tiles for messages', false, true);
 let mode_edit = new Mode('write ASCII char to map tile', false, false);

+let mode_teleport = new Mode('teleport away?');

 
 let tui = {
   mode: mode_waiting_for_server,
 
 let tui = {
   mode: mode_waiting_for_server,


@@ -281,6 +306,9 @@ let tui = {
            this.inputEl.value = explorer.info_db[explorer.position];
            this.recalc_input_lines();
         }
            this.inputEl.value = explorer.info_db[explorer.position];
            this.recalc_input_lines();
         }

+    } else if (mode == mode_teleport) {
+        tui.log_msg("Type Y or y to affirm teleportation, any other key to abort.");
+        tui.log_msg("target: " + tui.teleport_target);

     }
     this.full_refresh();
   },
     }
     this.full_refresh();
   },


@@ -300,12 +328,14 @@ let tui = {
     let chunk = "";
     let lines = [];
     for (let i = 0, x = 0; i < msg.length; i++, x++) {
     let chunk = "";
     let lines = [];
     for (let i = 0, x = 0; i < msg.length; i++, x++) {

-      if (x >= width) {
+      if (x >= width || msg[i] == "\n") {

         lines.push(chunk);
         chunk = "";
         x = 0;
       };
         lines.push(chunk);
         chunk = "";
         x = 0;
       };

-      chunk += msg[i];
+      if (msg[i] != "\n") {
+        chunk += msg[i];
+      }

     }
     lines.push(chunk);
     return lines;
     }
     lines.push(chunk);
     return lines;


@@ -348,7 +378,6 @@ let tui = {
         line.push(game.map[i]);
     };
     map_lines.push(line);
         line.push(game.map[i]);
     };
     map_lines.push(line);

-    let player_position = [0,0];

     let center_pos = [Math.floor(game.map_size[0] / 2),
                      Math.floor(game.map_size[1] / 2)];
     for (const thing_id in game.things) {
     let center_pos = [Math.floor(game.map_size[0] / 2),
                      Math.floor(game.map_size[1] / 2)];
     for (const thing_id in game.things) {


@@ -425,13 +454,17 @@ let tui = {
 }
 
 let game = {
 }
 
 let game = {

-  things: {},
-  turn: 0,
-  map: "",
-  map_size: [0,0],
-  player_id: -1
+    init: function() {
+        this.things = {};
+        this.turn = -1;
+        this.map = "";
+        this.map_size = [0,0];
+        this.player_id = -1;
+        this.portals = {};
+    },

 }
 
 }
 

+game.init();

 tui.init();
 tui.full_refresh();
 server.init(websocket_location);
 tui.init();
 tui.full_refresh();
 server.init(websocket_location);


@@ -477,11 +510,16 @@ let explorer = {
         server.send(["GET_ANNOTATION", unparser.to_yx(explorer.position)]);
     },
     get_info: function() {
         server.send(["GET_ANNOTATION", unparser.to_yx(explorer.position)]);
     },
     get_info: function() {

+        let info = "";
+        if (this.position in game.portals) {
+            info += "PORTAL: " + game.portals[this.position] + "\n";
+        }

         if (this.position in this.info_db) {
         if (this.position in this.info_db) {

-            return this.info_db[this.position];
+            info += "ANNOTATIONS: " + this.info_db[this.position];

         } else {
         } else {

-            return 'waiting …';
+            info += 'waiting …';

         }
         }

+        return info;

     },
     annotate: function(msg) {
         if (msg.length == 0) {
     },
     annotate: function(msg) {
         if (msg.length == 0) {


@@ -502,6 +540,12 @@ tui.inputEl.addEventListener('input', (event) => {
     } else if (tui.mode == mode_edit && tui.inputEl.value.length > 0) {
         server.send(["TASK:WRITE", tui.inputEl.value[0]]);
         tui.switch_mode(mode_play);
     } else if (tui.mode == mode_edit && tui.inputEl.value.length > 0) {
         server.send(["TASK:WRITE", tui.inputEl.value[0]]);
         tui.switch_mode(mode_play);

+    } else if (tui.mode == mode_teleport) {
+        if (['Y', 'y'].includes(tui.inputEl.value[0])) {
+            server.reconnect_to(tui.teleport_target);
+       } else {
+            tui.switch_mode(mode_play);
+       }

     }
 }, false);
 tui.inputEl.addEventListener('keydown', (event) => {
     }
 }, false);
 tui.inputEl.addEventListener('keydown', (event) => {


@@ -537,6 +581,12 @@ tui.inputEl.addEventListener('keydown', (event) => {
                     } else {
                         tui.log_msg('? need message target and message');
                     }
                     } else {
                         tui.log_msg('? need message target and message');
                     }

+                } else if (tokens[0] == ':reconnect') {
+                   if (tokens.length > 1) {
+                        server.reconnect_to(tokens[1]);
+                   } else {
+                        server.reconnect();
+                   }

                 } else {
                     tui.log_msg('? unknown command');
                 }
                 } else {
                     tui.log_msg('? unknown command');
                 }