home
·
contact
·
privacy
projects
/
plomrogue2
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace hard-coded client login welcome messages with optional server login messages.
[plomrogue2]
/
plomrogue
/
game.py
diff --git
a/plomrogue/game.py
b/plomrogue/game.py
index cfc4271935ba7ab2c420ef3cff296f36cdde3f06..8784007d8ddeed69e8611a7510e24266c7954dd9 100755
(executable)
--- a/
plomrogue/game.py
+++ b/
plomrogue/game.py
@@
-130,8
+130,9
@@
class Game(GameBase):
self.map_controls = {}
self.map_control_passwords = {}
self.annotations = {}
self.map_controls = {}
self.map_control_passwords = {}
self.annotations = {}
- self.spawn_point
= YX(0, 0), YX(0, 0)
+ self.spawn_point
s = []
self.portals = {}
self.portals = {}
+ self.intro_messages = []
self.player_chars = string.digits + string.ascii_letters
self.players_hat_chars = {}
self.player_char_i = -1
self.player_chars = string.digits + string.ascii_letters
self.players_hat_chars = {}
self.player_char_i = -1
@@
-195,6
+196,12
@@
class Game(GameBase):
return self.thing_types.keys()
return None
return self.thing_types.keys()
return None
+ def get_default_spawn_point(self):
+ import random
+ if len(self.spawn_points) == 0:
+ return (YX(0, 0), YX(0, 0))
+ return random.choice(self.spawn_points)
+
def get_map_geometry_shape(self):
return self.map_geometry.__class__.__name__[len('MapGeometry'):]
def get_map_geometry_shape(self):
return self.map_geometry.__class__.__name__[len('MapGeometry'):]
@@
-306,10
+313,7
@@
class Game(GameBase):
quote(t.thing_char)), c_id)
if hasattr(t, 'installable') and not t.portable:
self.io.send('THING_INSTALLED %s' % (t.id_), c_id)
quote(t.thing_char)), c_id)
if hasattr(t, 'installable') and not t.portable:
self.io.send('THING_INSTALLED %s' % (t.id_), c_id)
- if t.type_ == 'Hat':
- self.io.send('THING_HAT %s %s' % (t.id_,
- quote(t.design)), c_id)
- elif hasattr(t, 'design'):
+ if hasattr(t, 'design'):
self.io.send('THING_DESIGN %s %s %s'
% (t.id_, t.design_size, quote(t.design)),
c_id)
self.io.send('THING_DESIGN %s %s %s'
% (t.id_, t.design_size, quote(t.design)),
c_id)
@@
-342,15
+346,18
@@
class Game(GameBase):
self.io.send('GAME_ERROR ' + quote('name already in use'),
connection_id)
return
self.io.send('GAME_ERROR ' + quote('name already in use'),
connection_id)
return
- t = self.add_thing('Player', self.
spawn_point
)
+ t = self.add_thing('Player', self.
get_default_spawn_point()
)
t.name = nick
t.thing_char = self.get_next_player_char()
self.sessions[connection_id] = {
'thing_id': t.id_,
'status': 'player'
}
t.name = nick
t.thing_char = self.get_next_player_char()
self.sessions[connection_id] = {
'thing_id': t.id_,
'status': 'player'
}
+ print('DEBUG LOGIN', t.name, len(self.sessions))
self.io.send('PLAYER_ID %s' % t.id_, connection_id)
self.io.send('LOGIN_OK', connection_id)
self.io.send('PLAYER_ID %s' % t.id_, connection_id)
self.io.send('LOGIN_OK', connection_id)
+ for msg in self.intro_messages:
+ self.io.send('CHAT ' + quote(msg))
self.io.send('CHAT ' + quote(t.name + ' entered the map.'))
for s in [s for s in self.things
if s.type_ == 'SpawnPoint' and s.name == t.name]:
self.io.send('CHAT ' + quote(t.name + ' entered the map.'))
for s in [s for s in self.things
if s.type_ == 'SpawnPoint' and s.name == t.name]:
@@
-358,6
+365,7
@@
class Game(GameBase):
if s.temporary:
self.remove_thing(s)
break
if s.temporary:
self.remove_thing(s)
break
+ t.try_to_sit()
def run_tick(self):
def run_tick(self):
@@
-376,6
+384,7
@@
class Game(GameBase):
spawn_point = self.add_thing('SpawnPoint', t.position)
spawn_point.temporary = True
spawn_point.name = t.name
spawn_point = self.add_thing('SpawnPoint', t.position)
spawn_point.temporary = True
spawn_point.name = t.name
+ print('DEBUG LEFT MAP', t.name)
self.remove_thing(t)
to_delete += [connection_id]
for connection_id in to_delete:
self.remove_thing(t)
to_delete += [connection_id]
for connection_id in to_delete:
@@
-559,13
+568,13
@@
class Game(GameBase):
write(f, 'GOD_THING_NAME %s %s' % (t.id_, quote(t.name)))
if hasattr(t, 'installable') and (not t.portable):
write(f, 'THING_INSTALLED %s' % t.id_)
write(f, 'GOD_THING_NAME %s %s' % (t.id_, quote(t.name)))
if hasattr(t, 'installable') and (not t.portable):
write(f, 'THING_INSTALLED %s' % t.id_)
+ if hasattr(t, 'design'):
+ if t.type_ != 'Hat':
+ write(f, 'GOD_THING_DESIGN_SIZE %s %s' % (t.id_,
+ t.design_size))
+ write(f, 'GOD_THING_DESIGN %s %s' % (t.id_, quote(t.design)))
if t.type_ == 'Door' and t.blocks_movement:
write(f, 'THING_DOOR_CLOSED %s %s' % (t.id_, int(t.locked)))
if t.type_ == 'Door' and t.blocks_movement:
write(f, 'THING_DOOR_CLOSED %s %s' % (t.id_, int(t.locked)))
- elif t.type_ == 'Hat':
- write(f, 'THING_HAT_DESIGN %s %s' % (t.id_,
- quote(t.design)))
- elif hasattr(t, 'design'):
- write(f, 'GOD_THING_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)))
@@
-593,8
+602,10
@@
class Game(GameBase):
write(f, 'THING_SPAWNPOINT_CREATED %s %s'
% (next_thing_id, int(datetime.datetime.now().timestamp())))
next_thing_id += 1
write(f, 'THING_SPAWNPOINT_CREATED %s %s'
% (next_thing_id, int(datetime.datetime.now().timestamp())))
next_thing_id += 1
- write(f, 'SPAWN_POINT %s %s' % (self.spawn_point[0],
- self.spawn_point[1]))
+ for s in self.spawn_points:
+ write(f, 'SPAWN_POINT %s %s' % (s[0], s[1]))
+ for msg in self.intro_messages:
+ write(f, 'INTRO_MSG %s' % quote(msg))
@@
-615,7
+626,6
@@
class Game(GameBase):
self.annotations = {}
self.portals = {}
self.admin_passwords = []
self.annotations = {}
self.portals = {}
self.admin_passwords = []
- self.spawn_point = YX(0, 0), YX(0, 0)
self.map_geometry = map_geometry
self.map_control_passwords = {'X': 'secret'}
self.get_map(YX(0, 0))
self.map_geometry = map_geometry
self.map_control_passwords = {'X': 'secret'}
self.get_map(YX(0, 0))