X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=client.py;h=0a25e4513bd0687b5731651b40de51bb585ec125;hb=7a02f223961c532d9423433427c0e1b3e1cdb871;hp=fa5d9c42a82d08f10b98a22f198f0d382fa79b3d;hpb=e55fe364642dd23c11595418d53c11202a49f83b;p=plomrogue2-experiments diff --git a/client.py b/client.py index fa5d9c4..0a25e45 100755 --- a/client.py +++ b/client.py @@ -4,10 +4,10 @@ import plom_socket_io import socket import threading from parser import ArgError, Parser -from game_common import World +from game_common import World, Commander -class Game: +class Game(Commander): world = World() log_text = '' @@ -23,25 +23,6 @@ class Game: symbol = 'm' return symbol - def cmd_MAP_SIZE(self, yx): - """Set self.map_size to yx, redraw self.terrain_map as '?' cells.""" - self.world.set_map_size(yx) - cmd_MAP_SIZE.argtypes = 'yx_tuple:nonneg' - - def cmd_TERRAIN_LINE(self, y, terrain_line): - self.world.set_map_line(y, terrain_line) - cmd_TERRAIN_LINE.argtypes = 'int:nonneg string' - - 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): - t = self.world.get_thing(i) - t.position = list(yx) - cmd_THING_POS.argtypes = 'int:nonneg yx_tuple:nonneg' - def cmd_TURN_FINISHED(self, n): """Do nothing. (This may be extended later.)""" pass