game.send_gamestate(connection_id)
cmd_GET_GAMESTATE.argtypes = ''
-def cmd_QUERY(game, target_nick, msg, connection_id):
- if not connection_id in game.sessions:
- raise GameError('can only query when logged in')
- t = game.get_thing(game.sessions[connection_id], False)
- source_nick = t.nickname
- for t in [t for t in game.things if t.type_ == 'player' and t.nickname == target_nick]:
- for c_id in game.sessions:
- if game.sessions[c_id] == t.id_:
- game.io.send('CHAT ' + quote(source_nick+ '->' + target_nick + ': ' + msg), c_id)
- game.io.send('CHAT ' + quote(source_nick+ '->' + target_nick + ': ' + msg), connection_id)
- return
- raise GameError('target user offline')
- raise GameError('can only query with registered nicknames')
-cmd_QUERY.argtypes = 'string string'
+#def cmd_QUERY(game, target_nick, msg, connection_id):
+# if not connection_id in game.sessions:
+# raise GameError('can only query when logged in')
+# t = game.get_thing(game.sessions[connection_id], False)
+# source_nick = t.nickname
+# for t in [t for t in game.things if t.type_ == 'player' and t.nickname == target_nick]:
+# for c_id in game.sessions:
+# if game.sessions[c_id] == t.id_:
+# game.io.send('CHAT ' + quote(source_nick+ '->' + target_nick + ': ' + msg), c_id)
+# game.io.send('CHAT ' + quote(source_nick+ '->' + target_nick + ': ' + msg), connection_id)
+# return
+# raise GameError('target user offline')
+# raise GameError('can only query with registered nicknames')
+#cmd_QUERY.argtypes = 'string string'
def cmd_PING(game, connection_id):
game.io.send('PONG', connection_id)
from plomrogue.game import Game
from plomrogue.io_websocket import PlomWebSocketServer
from plomrogue.io_tcp import PlomTCPServer
-from plomrogue.commands import (cmd_ALL, cmd_LOGIN, cmd_NICK, cmd_QUERY, cmd_PING,
+from plomrogue.commands import (cmd_ALL, cmd_LOGIN, cmd_NICK, cmd_PING,
cmd_MAP, cmd_TURN, cmd_MAP_LINE, cmd_GET_ANNOTATION,
cmd_ANNOTATE, cmd_PORTAL, cmd_GET_GAMESTATE,
cmd_TASKS, cmd_MAP_CONTROL_LINE, cmd_MAP_CONTROL_PW,
game.register_command(cmd_ALL)
game.register_command(cmd_LOGIN)
game.register_command(cmd_NICK)
-game.register_command(cmd_QUERY)
game.register_command(cmd_TURN)
game.register_command(cmd_MAP)
game.register_command(cmd_MAP_LINE)
self.mode_edit = self.Mode('edit', 'This mode allows you to change the map tile you currently stand on (if your map editing password authorizes you so). Just enter any printable ASCII character to imprint it on the ground below you.')
self.mode_annotate = self.Mode('annotate', 'This mode allows you to add/edit a comment on the tile you are currently standing on (provided your map editing password authorizes you so). Hit Return to leave.', has_input_prompt=True, shows_info=True)
self.mode_portal = self.Mode('portal', 'This mode allows you to imprint/edit/remove a teleportation target on the ground you are currently standing on (provided your map editing password authorizes you so). Enter or edit a URL to imprint a teleportation target; enter emptiness to remove a pre-existing teleportation target. Hit Return to leave.', has_input_prompt=True, shows_info=True)
- self.mode_chat = self.Mode('chat', 'This mode allows you to engage in chit-chat with other users. Any line you enter into the input prompt that does not start with a "/" will be sent to all users. Lines that start with a "/" are used for commands like:', has_input_prompt=True)
+ self.mode_chat = self.Mode('chat', 'This mode allows you to engage in chit-chat with other users. Any line you enter into the input prompt that does not start with a "/" will be sent out to nearby players – but barriers and distance will reduce what they can read, so stand close to them to ensure they get your message. Lines that start with a "/" are used for commands like:', has_input_prompt=True)
self.mode_waiting_for_server = self.Mode('waiting_for_server', 'Waiting for a server response.', is_intro=True)
self.mode_login = self.Mode('login', 'Pick your player name.', has_input_prompt=True, is_intro=True)
self.mode_post_login_wait = self.Mode('post_login_wait', 'Waiting for a server response.', is_intro=True)
content += '[%s] – play mode\n' % self.keys['switch_to_play']
elif self.mode == self.mode_chat:
content += '/nick NAME – re-name yourself to NAME\n'
- content += '/msg USER TEXT – send TEXT to USER\n'
+ #content += '/msg USER TEXT – send TEXT to USER\n'
content += '/%s or /play – switch to play mode\n' % self.keys['switch_to_play']
content += '/%s or /study – switch to study mode\n' % self.keys['switch_to_study']
for i in range(self.size.y):
self.send('NICK ' + quote(tokens[1]))
else:
self.log_msg('? need login name')
- elif self.input_.startswith('/msg'):
- tokens = self.input_.split(maxsplit=2)
- if len(tokens) == 3:
- self.send('QUERY %s %s' % (quote(tokens[1]),
- quote(tokens[2])))
- else:
- self.log_msg('? need message target and message')
+ #elif self.input_.startswith('/msg'):
+ # tokens = self.input_.split(maxsplit=2)
+ # if len(tokens) == 3:
+ # self.send('QUERY %s %s' % (quote(tokens[1]),
+ # quote(tokens[2])))
+ # else:
+ # self.log_msg('? need message target and message')
else:
self.log_msg('? unknown command')
else:
</div>
<script>
"use strict";
-let websocket_location = "wss://plomlompom.com/rogue_chat/";
+//let websocket_location = "wss://plomlompom.com/rogue_chat/";
+let websocket_location = "ws://localhost:8000/";
let rows_selector = document.getElementById("n_rows");
let cols_selector = document.getElementById("n_cols");
let mode_waiting_for_server = new Mode('waiting_for_server', 'Waiting for a server response.', false, false, true);
let mode_login = new Mode('login', 'Pick your player name.', true, false, true);
let mode_post_login_wait = new Mode('waiting for game world', 'Waiting for a server response.', false, false, true);
-let mode_chat = new Mode('chat', 'This mode allows you to engage in chit-chat with other users. Any line you enter into the input prompt that does not start with a "/" will be sent to all users. Lines that start with a "/" are used for commands like:', true, false);
+let mode_chat = new Mode('chat', 'This mode allows you to engage in chit-chat with other users. Any line you enter into the input prompt that does not start with a "/" will be sent out to nearby players – but barriers and distance will reduce what they can read, so stand close to them to ensure they get your message. Lines that start with a "/" are used for commands like:', true, false);
let mode_annotate = new Mode('annotate', 'This mode allows you to add/edit a comment on the tile you are currently standing on (provided your map editing password authorizes you so). Hit Return to leave.', true, true);
let mode_play = new Mode('play', 'This mode allows you to interact with the map.', false, false);
let mode_study = new Mode('study', 'This mode allows you to study the map and its tiles in detail. Move the question mark over a tile, and the right half of the screen will show detailed information on it.', false, true);
content += '[' + this.keys.switch_to_play + '] – play mode\n';
} else if (this.mode == mode_chat) {
content += '/nick NAME – re-name yourself to NAME\n';
- content += '/msg USER TEXT – send TEXT to USER\n';
+ //content += '/msg USER TEXT – send TEXT to USER\n';
content += '/' + this.keys.switch_to_play + ' or /play – switch to play mode\n';
content += '/' + this.keys.switch_to_study + ' or /study – switch to study mode\n';
}
} else {
tui.log_msg('? need new name');
}
- } else if (tokens[0].slice(1) == 'msg') {
- if (tokens.length > 2) {
- let msg = tui.inputEl.value.slice(token_starts[2]);
- server.send(['QUERY', tokens[1], msg]);
- } else {
- tui.log_msg('? need message target and message');
- }
+ //} else if (tokens[0].slice(1) == 'msg') {
+ // if (tokens.length > 2) {
+ // let msg = tui.inputEl.value.slice(token_starts[2]);
+ // server.send(['QUERY', tokens[1], msg]);
+ // } else {
+ // tui.log_msg('? need message target and message');
+ // }
} else {
tui.log_msg('? unknown command');
}
projects / plomrogue2 / commitdiff