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 dc5924d4d1d43292db9f11c7bbf572a6d2f97350..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_points = [
(YX(0, 0), YX(0, 0))
]
+ self.spawn_points = []
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'):]
@@
-334,13
+341,12
@@
class Game(GameBase):
self.changed = True
def login(self, nick, connection_id):
self.changed = True
def login(self, nick, connection_id):
- import random
for t in [t for t in self.things
if t.type_ == 'Player' and t.name == nick]:
self.io.send('GAME_ERROR ' + quote('name already in use'),
connection_id)
return
for t in [t for t in self.things
if t.type_ == 'Player' and t.name == nick]:
self.io.send('GAME_ERROR ' + quote('name already in use'),
connection_id)
return
- t = self.add_thing('Player',
random.choice(self.spawn_points
))
+ 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] = {
t.name = nick
t.thing_char = self.get_next_player_char()
self.sessions[connection_id] = {
@@
-350,6
+356,8
@@
class Game(GameBase):
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)
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)
+ 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]:
@@
-595,7
+603,9
@@
class Game(GameBase):
% (next_thing_id, int(datetime.datetime.now().timestamp())))
next_thing_id += 1
for s in self.spawn_points:
% (next_thing_id, int(datetime.datetime.now().timestamp())))
next_thing_id += 1
for s in self.spawn_points:
- write(f, 'SPAWN_POINT %s %s' % (s[0], s[1]))
+ write(f, 'SPAWN_POINT %s %s' % (s[0], s[1]))
+ for msg in self.intro_messages:
+ write(f, 'INTRO_MSG %s' % quote(msg))
@@
-616,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))