home
·
contact
·
privacy
projects
/
plomrogue2
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Re-calibrate bladder pressure following weariness mechanic.
[plomrogue2]
/
plomrogue
/
game.py
diff --git
a/plomrogue/game.py
b/plomrogue/game.py
index d3ab1e73b08b8b19d6bcc81f3832d6a72811d963..5e6c14433a2a8ea045e4cb090d04ad1fc2be9297 100755
(executable)
--- a/
plomrogue/game.py
+++ b/
plomrogue/game.py
@@
-136,9
+136,10
@@
class Game(GameBase):
self.players_hat_chars = {}
self.player_char_i = -1
self.admin_passwords = []
self.players_hat_chars = {}
self.player_char_i = -1
self.admin_passwords = []
- self.send_gamestate_interval = datetime.timedelta(seconds=0.04)
+ 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.last_send_gamestate = datetime.datetime.now() -\
- self.send_gamestate_interval
+ self.send_gamestate_
min_
interval
self.terrains = {
'.': Terrain('.', 'floor'),
'X': Terrain('X', 'wall', blocks_light=True, blocks_sound=True,
self.terrains = {
'.': Terrain('.', 'floor'),
'X': Terrain('X', 'wall', blocks_light=True, blocks_sound=True,
@@
-276,6
+277,8
@@
class Game(GameBase):
player = self.get_player(c_id)
self.io.send('PLAYERS_HAT_CHARS ' + quote(player.get_cookie_chars()),
c_id)
player = self.get_player(c_id)
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)
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(),
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(),
@@
-387,12
+390,13
@@
class Game(GameBase):
self.io.send('PLAY_ERROR ' + quote(str(e)), connection_id)
# send gamestate if it makes sense at this point
self.io.send('PLAY_ERROR ' + quote(str(e)), connection_id)
# send gamestate if it makes sense at this point
- if self.changed:
+ if self.changed or self.last_send_gamestate < \
+ datetime.datetime.now() - self.send_gamestate_max_interval:
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
if self.last_send_gamestate < \
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
if self.last_send_gamestate < \
- datetime.datetime.now() -
self.send_gamestate
_interval:
+ datetime.datetime.now() -
self.send_gamestate_min
_interval:
n_changes = 0
for type_ in self.changed_tiles:
n_changes += len(self.changed_tiles[type_])
n_changes = 0
for type_ in self.changed_tiles:
n_changes += len(self.changed_tiles[type_])