Invert weariness metric into energy metric.

[plomrogue2] / plomrogue / game.py

diff --git a/plomrogue/game.py b/plomrogue/game.py
index 5f91a1118c5932794945e015b5091fecae0b486e..ff035bb8dd28f3ab0b22425b22cb1f3f1e5e312d 100755 (executable)
--- 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 = {
@@ -277,7 +276,8 @@ class Game(GameBase):
             player = self.get_player(c_id)
             self.io.send('PLAYERS_HAT_CHARS ' + quote(player.get_cookie_chars()),
                          c_id)
-            self.io.send('BLADDER_PRESSURE %s' % player.need_for_toilet)
+            self.io.send('STATS %s %s' % (player.need_for_toilet,
+                                          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(),
@@ -389,8 +389,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
@@ -562,9 +561,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