X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=plomrogue%2Fgame.py;h=4b5c3372eba5b2d96fccfb72ec0d7e8250645b37;hb=52a97e1d01fd8541ec8993f1d680aeb56243df9d;hp=5e6c14433a2a8ea045e4cb090d04ad1fc2be9297;hpb=dfb05774efac717d1adc699e97b6140599e5df1e;p=plomrogue2

diff --git a/plomrogue/game.py b/plomrogue/game.py
index 5e6c144..4b5c337 100755
--- a/plomrogue/game.py
+++ b/plomrogue/game.py
@@ -137,7 +137,6 @@ class Game(GameBase):
         self.player_char_i = -1
         self.admin_passwords = []
         self.send_gamestate_min_interval = datetime.timedelta(seconds=0.04)
-        self.send_gamestate_max_interval = datetime.timedelta(seconds=5)
         self.last_send_gamestate = datetime.datetime.now() -\
             self.send_gamestate_min_interval
         self.terrains = {
@@ -147,6 +146,7 @@ class Game(GameBase):
             '=': Terrain('=', 'glass', blocks_sound=True, blocks_movement=True),
             'T': Terrain('T', 'table', blocks_movement=True),
         }
+        self.draw_control_presets = True
         if os.path.exists(self.io.save_file):
             if not os.path.isfile(self.io.save_file):
                 raise GameError('save file path refers to non-file')
@@ -278,7 +278,7 @@ class Game(GameBase):
             self.io.send('PLAYERS_HAT_CHARS ' + quote(player.get_cookie_chars()),
                          c_id)
             self.io.send('STATS %s %s' % (player.need_for_toilet,
-                                          player.weariness), c_id)
+                                          player.energy), c_id)
             if player.id_ in player_ids_send_fov:
                 self.io.send('FOV %s' % quote(player.fov_stencil.terrain), c_id)
                 self.io.send('MAP %s %s %s' % (self.get_map_geometry_shape(),
@@ -390,8 +390,7 @@ class Game(GameBase):
                         self.io.send('PLAY_ERROR ' + quote(str(e)), connection_id)
 
         # send gamestate if it makes sense at this point
-        if self.changed or self.last_send_gamestate < \
-           datetime.datetime.now() - self.send_gamestate_max_interval:
+        if self.changed:
             self.turn += 1
             # send_gamestate() can be rather expensive, due to among other reasons
             # re-calculating players' FOVs, so don't send it out too often
@@ -500,6 +499,9 @@ class Game(GameBase):
         with open(self.io.save_file, 'w') as f:
             write(f, 'TURN %s' % self.turn)
             map_geometry_shape = self.get_map_geometry_shape()
+            # must come before MAP, otherwise first get_map uses the default
+            # TODO: refactor into MAP
+            write(f, 'MAP_CONTROL_PRESETS %s' % int(self.draw_control_presets))
             write(f, 'MAP %s %s' % (map_geometry_shape, self.map_geometry.size,))
             for terrain in self.terrains.values():
                 write(f, 'TERRAIN %s %s %s %s %s' % (quote(terrain.character),
@@ -563,9 +565,14 @@ class Game(GameBase):
                     write(f, 'THING_BOTTLE_EMPTY %s' % t.id_)
                 elif t.type_ == 'DoorKey':
                     write(f, 'THING_DOOR_KEY %s %s' % (t.id_, t.door.id_))
+                elif t.type_ == 'Crate':
+                    for item in t.content:
+                        write(f, 'THING_CRATE_ITEM %s %s' % (t.id_, item.id_))
             write(f, 'SPAWN_POINT %s %s' % (self.spawn_point[0],
                                             self.spawn_point[1]))
 
+
+
     def get_map(self, big_yx, type_='normal'):
         if type_ == 'normal':
             maps = self.maps
@@ -573,7 +580,7 @@ class Game(GameBase):
             maps = self.map_controls
         if big_yx not in maps:
             maps[big_yx] = SaveableMap(self.map_geometry)
-            if type_ == 'control':
+            if self.draw_control_presets and type_ == 'control':
                 maps[big_yx].draw_presets(big_yx.y % 2)
         return maps[big_yx]