X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=new2%2Fplomrogue%2Fgame.py;h=8fb264447d5c2e30f757d2d507c9e62e5a3ee84d;hb=9209d0e0f1bbc79f872ce3b2bd353f1307a7c84d;hp=4a4f2972756832a647582cdc5503a60e7d329b42;hpb=25042810293b1ee02c39b7d0bd4c9d9016972d75;p=plomrogue2-experiments
diff --git a/new2/plomrogue/game.py b/new2/plomrogue/game.py
index 4a4f297..8fb2644 100755
--- a/new2/plomrogue/game.py
+++ b/new2/plomrogue/game.py
@@ -1,7 +1,8 @@
-from plomrogue.tasks import Task_WAIT, Task_MOVE, Task_WRITE
+from plomrogue.tasks import (Task_WAIT, Task_MOVE, Task_WRITE,
+ Task_FLATTEN_SURROUNDINGS)
from plomrogue.errors import GameError
from plomrogue.commands import (cmd_ALL, cmd_LOGIN, cmd_QUERY, cmd_PING,
- cmd_TURN, cmd_MAP_LINE)
+ cmd_TURN, cmd_MAP_LINE, cmd_MAP)
from plomrogue.io import GameIO
from plomrogue.misc import quote
from plomrogue.things import Thing, ThingPlayer
@@ -39,13 +40,15 @@ class Game(GameBase):
self.io = GameIO(self, save_file)
self.tasks = {'WAIT': Task_WAIT,
'MOVE': Task_MOVE,
- 'WRITE': Task_WRITE}
+ 'WRITE': Task_WRITE,
+ 'FLATTEN_SURROUNDINGS': Task_FLATTEN_SURROUNDINGS}
self.map_geometry = MapGeometrySquare(YX(24, 40))
self.commands = {'QUERY': cmd_QUERY,
'ALL': cmd_ALL,
'LOGIN': cmd_LOGIN,
'TURN': cmd_TURN,
'MAP_LINE': cmd_MAP_LINE,
+ 'MAP': cmd_MAP,
'PING': cmd_PING}
self.thing_type = Thing
self.thing_types = {'player': ThingPlayer}
@@ -68,7 +71,7 @@ class Game(GameBase):
return self.map_geometry.get_directions()
if string_option_type == 'char':
return [c for c in
- string.digits + string.ascii_letters + string.punctuation]
+ string.digits + string.ascii_letters + string.punctuation + ' ']
return None
def send_gamestate(self, connection_id=None):
@@ -157,5 +160,10 @@ class Game(GameBase):
with open(self.io.save_file, 'w') as f:
write(f, 'TURN %s' % self.turn)
+ write(f, 'MAP %s' % (self.map_geometry.size,))
for y, line in self.map.lines():
write(f, 'MAP_LINE %5s %s' % (y, quote(line)))
+
+ def new_map(self, size):
+ self.map_geometry = MapGeometrySquare(YX(size.y, size.x))
+ self.map = Map(self.map_geometry.size)