X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;ds=sidebyside;f=server.py;h=08f3815e799529926298fe139a4d3c4e3279febd;hb=c1b22c37ec9732578d8268b8d5dfd1866755f36c;hp=16915e9e6671d982fb200c6aa18da8805d041205;hpb=ca1257ec655f95611de1cbbac2814509d23f6116;p=plomrogue2-experiments

diff --git a/server.py b/server.py
index 16915e9..08f3815 100755
--- a/server.py
+++ b/server.py
@@ -106,12 +106,16 @@ class CommandHandler:
 
     def handle_input(self, input_, connection_id=None, abort_on_error=False):
         """Process input_ to command grammar, call command handler if found."""
+        from inspect import signature
         try:
             command = self.parser.parse(input_)
             if command is None:
                 self.send_to(connection_id, 'UNHANDLED INPUT')
             else:
-                command(connection_id=connection_id)
+                if 'connection_id' in list(signature(command).parameters):
+                    command(connection_id=connection_id)
+                else:
+                    command()
         except ArgError as e:
             self.send_to(connection_id, 'ARGUMENT ERROR: ' + str(e))
             if abort_on_error:
@@ -154,7 +158,7 @@ class CommandHandler:
         self.send_all('MAP_SIZE ' + self.stringify_yx(self.world.map_size))
         for y in range(self.world.map_size[0]):
             width = self.world.map_size[1]
-            terrain_line = self.world.map_[y * width:(y + 1) * width]
+            terrain_line = self.world.terrain_map[y * width:(y + 1) * width]
             self.send_all('TERRAIN_LINE %5s %s' % (y, self.quoted(terrain_line)))
         for thing in self.world.things:
             self.send_all('THING_TYPE %s %s' % (thing.id_, thing.type_))
@@ -170,37 +174,34 @@ class CommandHandler:
         self.world.proceed_to_next_player_turn()
         self.send_all_gamestate()
 
-    def get_player(self):
-        return self.world.get_thing(self.world.player_id)
-
-    def cmd_MOVE(self, direction, connection_id):
+    def cmd_MOVE(self, direction):
         """Set player task to 'move' with direction arg, finish player turn."""
         if direction not in {'UP', 'DOWN', 'RIGHT', 'LEFT'}:
             raise ArgError('Move argument must be one of: '
                            'UP, DOWN, RIGHT, LEFT')
-        self.get_player().set_task('move', direction=direction)
+        self.world.get_player().set_task('move', direction=direction)
         self.proceed()
     cmd_MOVE.argtypes = 'string'
 
-    def cmd_WAIT(self, connection_id):
+    def cmd_WAIT(self):
         """Set player task to 'wait', finish player turn."""
-        self.get_player().set_task('wait')
+        self.world.get_player().set_task('wait')
         self.proceed()
 
-    def cmd_MAP_SIZE(self, yx, connection_id):
+    def cmd_MAP_SIZE(self, yx):
         self.world.set_map_size(yx)
     cmd_MAP_SIZE.argtypes = 'yx_tuple:nonneg'
 
-    def cmd_TERRAIN_LINE(self, y, line, connection_id):
+    def cmd_TERRAIN_LINE(self, y, line):
         self.world.set_map_line(y, line)
     cmd_TERRAIN_LINE.argtypes = 'int:nonneg string'
 
-    def cmd_THING_TYPE(self, i, type_, connection_id):
+    def cmd_THING_TYPE(self, i, type_):
         t = self.world.get_thing(i)
         t.type_ = type_
     cmd_THING_TYPE.argtypes = 'int:nonneg string'
 
-    def cmd_THING_POS(self, i, yx, connection_id):
+    def cmd_THING_POS(self, i, yx):
         t = self.world.get_thing(i)
         t.position = list(yx)
     cmd_THING_POS.argtypes = 'int:nonneg yx_tuple:nonneg'