Add map terrain.

diff --git a/new2/plomrogue/game.py b/new2/plomrogue/game.py
index a8fc4edf08bd037175b9d9e70b3f1f60ba543449..e8c85da35adef872a0667bf97a75c09189049995 100755 (executable)
--- a/new2/plomrogue/game.py
+++ b/new2/plomrogue/game.py
@@ -4,7 +4,7 @@ from plomrogue.commands import cmd_ALL, cmd_LOGIN, cmd_QUERY
 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 

-from plomrogue.mapping import YX, MapGeometrySquare
+from plomrogue.mapping import YX, MapGeometrySquare, Map

 
 
 
 
 
 


@@ -44,6 +44,7 @@ class Game(GameBase):
         self.thing_type = Thing
         self.thing_types = {'player': ThingPlayer}
         self.sessions = {}
         self.thing_type = Thing
         self.thing_types = {'player': ThingPlayer}
         self.sessions = {}

+        self.map = Map(self.map_geometry.size)

 
     def get_string_options(self, string_option_type):
         if string_option_type == 'direction':
 
     def get_string_options(self, string_option_type):
         if string_option_type == 'direction':


@@ -59,6 +60,7 @@ class Game(GameBase):
         self.io.send('TURN ' + str(self.turn))
         for t in self.things:
             send_thing(t)
         self.io.send('TURN ' + str(self.turn))
         for t in self.things:
             send_thing(t)

+        self.io.send('MAP %s %s' % (self.map_geometry.size, quote(self.map.terrain)))

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

diff --git a/new2/plomrogue/mapping.py b/new2/plomrogue/mapping.py
index 585000a1d0f471dfd8b4b5d2c0a3f6ecccb39445..0a96058c29c2f9b7b990dc98083a84b47037f504 100644 (file)
--- a/new2/plomrogue/mapping.py
+++ b/new2/plomrogue/mapping.py
@@ -54,3 +54,15 @@ class MapGeometrySquare(MapGeometryWithLeftRightMoves):
 
     def move_DOWN(self, start_pos):
         return YX(start_pos.y + 1, start_pos.x)
 
     def move_DOWN(self, start_pos):
         return YX(start_pos.y + 1, start_pos.x)

+
+
+
+class Map():
+
+    def __init__(self, map_size):
+        self.size = map_size
+        self.terrain = '.' * self.size_i
+
+    @property
+    def size_i(self):
+        return self.size.y * self.size.x

diff --git a/new2/rogue_chat.html b/new2/rogue_chat.html
index cefc451dabcbfbbeca91cdc0ed533926ae9ab52a..f1146cb7c9cd70646656c85c80ef67a4882a4973 100644 (file)
--- a/new2/rogue_chat.html
+++ b/new2/rogue_chat.html
@@ -78,7 +78,7 @@ let parser = {
     }
     return tokens;
   },
     }
     return tokens;
   },

-  parse_position(position_string) {
+  parse_yx(position_string) {

     let coordinate_strings = position_string.split(',')
     let position = [0, 0];
     position[0] = coordinate_strings[0].slice(2);
     let coordinate_strings = position_string.split(',')
     let position = [0, 0];
     position[0] = coordinate_strings[0].slice(2);


@@ -101,6 +101,18 @@ let tui = {
   },
   draw_map: function() {
     terminal.drawBox(0, 0, terminal.rows, terminal.cols / 2);
   },
   draw_map: function() {
     terminal.drawBox(0, 0, terminal.rows, terminal.cols / 2);

+    let map_line = "";
+    let y = 0;
+    for (let i = 0, x = 0; i < game.map.length; i++, x++) {
+      if (x >= game.map_size[1]) {
+       terminal.write(y, 0, map_line);
+       map_line = "";
+        x = 0;
+       y += 1;
+      };
+      map_line += game.map[i];
+    }
+    terminal.write(y, 0, map_line);

     for (const t in game.things) {
       terminal.write(game.things[t][0], game.things[t][1], '@');
     }
     for (const t in game.things) {
       terminal.write(game.things[t][0], game.things[t][1], '@');
     }


@@ -124,7 +136,9 @@ let tui = {
 
 let game = {
   things: {},
 
 let game = {
   things: {},

-  tick: 0
+  tick: 0,
+  map: "",
+  map_size: [1,1]

 }
 
 let chat = {
 }
 
 let chat = {


@@ -177,7 +191,10 @@ websocket.onmessage = function (event) {
     game.things = {}
     game.tick = parseInt(tokens[1]);
   } else if (tokens[0] === 'THING_POS') {
     game.things = {}
     game.tick = parseInt(tokens[1]);
   } else if (tokens[0] === 'THING_POS') {

-    game.things[tokens[1]] = parser.parse_position(tokens[2]); 
+    game.things[tokens[1]] = parser.parse_yx(tokens[2]);
+  } else if (tokens[0] === 'MAP') {
+    game.map_size = parser.parse_yx(tokens[1]);
+    game.map = tokens[2]

   } else if (tokens[0] === 'GAME_STATE_COMPLETE') {
     tui.draw_tick_line();
     tui.draw_map();
   } else if (tokens[0] === 'GAME_STATE_COMPLETE') {
     tui.draw_tick_line();
     tui.draw_map();