X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;ds=sidebyside;f=new2%2Fplomrogue%2Fgame.py;h=e8c85da35adef872a0667bf97a75c09189049995;hb=428ba19a1984f385f5fc55201734a150f59dafcb;hp=e0c07155b0333486d1b82cf41ee0cc3af376417f;hpb=33bfdaf647c6736d99aadc017ee935f3301d758a;p=plomrogue2-experiments

diff --git a/new2/plomrogue/game.py b/new2/plomrogue/game.py
index e0c0715..e8c85da 100755
--- a/new2/plomrogue/game.py
+++ b/new2/plomrogue/game.py
@@ -4,6 +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.mapping import YX, MapGeometrySquare, Map
 
 
 
@@ -36,14 +37,18 @@ class Game(GameBase):
         self.io = GameIO(self)
         self.tasks = {'WAIT': Task_WAIT,
                       'MOVE': Task_MOVE}
-        self.commands = {'QUERY': cmd_QUERY, 'ALL': cmd_ALL, 'LOGIN': cmd_LOGIN}
+        self.map_geometry = MapGeometrySquare(YX(24, 40))
+        self.commands = {'QUERY': cmd_QUERY,
+                         'ALL': cmd_ALL,
+                         'LOGIN': cmd_LOGIN}
         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':
-            return ['UP', 'DOWN', 'LEFT', 'RIGHT'] 
+            return self.map_geometry.get_directions()
         return None
 
     def send_gamestate(self, connection_id=None):
@@ -55,6 +60,8 @@ class Game(GameBase):
         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):
         to_delete = []