home
·
contact
·
privacy
projects
/
plomrogue2
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Spawn hats from BottleDeposit, add HatRemixer.
[plomrogue2]
/
plomrogue
/
game.py
diff --git
a/plomrogue/game.py
b/plomrogue/game.py
index 68d4858da793b07d9385a0ebcc25a579dc353263..5e206b9c8c289155a59aa7700dd9306ea4e05e79 100755
(executable)
--- a/
plomrogue/game.py
+++ b/
plomrogue/game.py
@@
-121,6
+121,8
@@
class Game(GameBase):
self.tasks = {}
self.thing_types = {}
self.sessions = {}
self.tasks = {}
self.thing_types = {}
self.sessions = {}
+ self.faces = {}
+ self.hats = {}
self.maps = {}
self.map_controls = {}
self.map_control_passwords = {}
self.maps = {}
self.map_controls = {}
self.map_control_passwords = {}
@@
-199,6
+201,14
@@
class Game(GameBase):
player = self.get_thing(self.sessions[connection_id]['thing_id'])
return player
player = self.get_thing(self.sessions[connection_id]['thing_id'])
return player
+ def get_face(self, t):
+ if t.type_ == 'Player':
+ if t.name in self.faces:
+ return self.faces[t.name]
+ else:
+ return 'O O' + ' v ' + '>-<'
+ return None
+
def send_gamestate(self, connection_id=None):
"""Send out game state data relevant to clients."""
def send_gamestate(self, connection_id=None):
"""Send out game state data relevant to clients."""
@@
-237,6
+247,12
@@
class Game(GameBase):
c_id)
if hasattr(t, 'name'):
self.io.send('THING_NAME %s %s' % (t.id_, quote(t.name)), c_id)
c_id)
if hasattr(t, 'name'):
self.io.send('THING_NAME %s %s' % (t.id_, quote(t.name)), c_id)
+ if t.type_ == 'Player' and t.name in self.hats:
+ hat = self.hats[t.name]
+ self.io.send('THING_HAT %s %s' % (t.id_, quote(hat)), c_id)
+ face = self.get_face(t)
+ if face:
+ self.io.send('THING_FACE %s %s' % (t.id_, quote(face)), c_id)
if hasattr(t, 'thing_char'):
self.io.send('THING_CHAR %s %s' % (t.id_,
quote(t.thing_char)), c_id)
if hasattr(t, 'thing_char'):
self.io.send('THING_CHAR %s %s' % (t.id_,
quote(t.thing_char)), c_id)
@@
-371,6
+387,12
@@
class Game(GameBase):
self.map_control_passwords[tile_class]))
for pw in self.admin_passwords:
write(f, 'ADMIN_PASSWORD %s' % pw)
self.map_control_passwords[tile_class]))
for pw in self.admin_passwords:
write(f, 'ADMIN_PASSWORD %s' % pw)
+ for name in self.faces:
+ write(f, 'GOD_PLAYER_FACE %s %s' % (quote(name),
+ quote(self.faces[name])))
+ for name in self.hats:
+ write(f, 'GOD_PLAYER_HAT %s %s' % (quote(name),
+ quote(self.hats[name])))
for t in [t for t in self.things if not t.type_ == 'Player']:
write(f, 'THING %s %s %s %s' % (t.position[0],
t.position[1], t.type_, t.id_))
for t in [t for t in self.things if not t.type_ == 'Player']:
write(f, 'THING %s %s %s %s' % (t.position[0],
t.position[1], t.type_, t.id_))
@@
-381,6
+403,9
@@
class Game(GameBase):
write(f, 'THING_INSTALLED %s' % t.id_)
if t.type_ == 'Door' and t.blocking:
write(f, 'THING_DOOR_CLOSED %s' % t.id_)
write(f, 'THING_INSTALLED %s' % t.id_)
if t.type_ == 'Door' and t.blocking:
write(f, 'THING_DOOR_CLOSED %s' % t.id_)
+ elif t.type_ == 'Hat':
+ write(f, 'THING_HAT_DESIGN %s %s' % (t.id_,
+ quote(t.design)))
elif t.type_ == 'MusicPlayer':
write(f, 'THING_MUSICPLAYER_SETTINGS %s %s %s %s' %
(t.id_, int(t.playing), t.playlist_index, int(t.repeat)))
elif t.type_ == 'MusicPlayer':
write(f, 'THING_MUSICPLAYER_SETTINGS %s %s %s %s' %
(t.id_, int(t.playing), t.playlist_index, int(t.repeat)))