<button id="drop_thing"></button>
<button id="door"></button>
<button id="consume"></button>
+ <button id="switch_to_command_thing"></button>
<button id="teleport"></button>
</td>
</tr>
<li><input id="key_switch_to_edit" type="text" value="E" />
<li><input id="key_switch_to_write" type="text" value="m" />
<li><input id="key_switch_to_name_thing" type="text" value="N" />
+<li><input id="key_switch_to_command_thing" type="text" value="O" />
<li><input id="key_switch_to_password" type="text" value="P" />
<li><input id="key_switch_to_admin_enter" type="text" value="A" />
<li><input id="key_switch_to_control_pw_type" type="text" value="C" />
</div>
<script>
"use strict";
-let websocket_location = "wss://plomlompom.com/rogue_chat/";
-//let websocket_location = "ws://localhost:8000/";
+//let websocket_location = "wss://plomlompom.com/rogue_chat/";
+let websocket_location = "ws://localhost:8001/";
let mode_helps = {
'play': {
'short': 'name thing',
'long': 'Give name to/change name of thing here.'
},
+ 'command_thing': {
+ 'short': 'command thing',
+ 'long': 'Enter a command to the thing you carry. Enter nothing to return to play mode.'
+ },
'admin_thing_protect': {
'short': 'change thing protection',
'long': 'Change protection character for thing here.'
let tokens = parser.tokenize(event.data);
if (tokens[0] === 'TURN') {
game.turn_complete = false;
- explorer.empty_info_db();
+ explorer.empty_annotations();
game.things = {};
game.portals = {};
+ game.fov = '';
game.turn = parseInt(tokens[1]);
} else if (tokens[0] === 'THING') {
let t = game.get_thing(tokens[4], true);
} else if (tokens[0] === 'TASKS') {
game.tasks = tokens[1].split(',');
tui.mode_write.legal = game.tasks.includes('WRITE');
+ tui.mode_command_thing.legal = game.tasks.includes('WRITE');
} else if (tokens[0] === 'THING_TYPE') {
game.thing_types[tokens[1]] = tokens[2]
} else if (tokens[0] === 'TERRAIN') {
game.turn_complete = true;
if (tui.mode.name == 'post_login_wait') {
tui.switch_mode('play');
- } else if (tui.mode.name == 'study') {
- explorer.query_info();
}
+ explorer.info_cached = false;
tui.full_refresh();
} else if (tokens[0] === 'CHAT') {
tui.log_msg('# ' + tokens[1], 1);
+ } else if (tokens[0] === 'REPLY') {
+ tui.log_msg('#MUSICPLAYER: ' + tokens[1], 1);
} else if (tokens[0] === 'PLAYER_ID') {
game.player_id = parseInt(tokens[1]);
} else if (tokens[0] === 'LOGIN_OK') {
} else if (tokens[0] === 'PORTAL') {
let position = parser.parse_yx(tokens[1]);
game.portals[position] = tokens[2];
- } else if (tokens[0] === 'ANNOTATION_HINT') {
- let position = parser.parse_yx(tokens[1]);
- explorer.info_hints = explorer.info_hints.concat([position]);
} else if (tokens[0] === 'ANNOTATION') {
let position = parser.parse_yx(tokens[1]);
- explorer.update_info_db(position, tokens[2]);
+ explorer.update_annotations(position, tokens[2]);
tui.full_refresh();
} else if (tokens[0] === 'UNHANDLED_INPUT') {
tui.log_msg('? unknown command');
mode_portal: new Mode('portal', true, true),
mode_password: new Mode('password', true),
mode_name_thing: new Mode('name_thing', true, true),
+ mode_command_thing: new Mode('command_thing', true),
mode_admin_enter: new Mode('admin_enter', true),
mode_admin: new Mode('admin'),
mode_control_pw_pw: new Mode('control_pw_pw', true),
'drop_thing': 'DROP',
'move': 'MOVE',
'door': 'DOOR',
+ 'command': 'COMMAND',
'consume': 'INTOXICATE',
},
offset: [0,0],
map_lines: [],
init: function() {
this.mode_chat.available_modes = ["play", "study", "edit", "admin_enter"]
- this.mode_play.available_modes = ["chat", "study", "edit", "admin_enter"]
+ this.mode_play.available_modes = ["chat", "study", "edit", "admin_enter",
+ "command_thing"]
this.mode_play.available_actions = ["move", "take_thing", "drop_thing",
"teleport", "door", "consume"];
this.mode_study.available_modes = ["chat", "play", "admin_enter", "edit"]
}
if (game.player_id in game.things && (this.mode.shows_info || this.mode.name == 'control_tile_draw')) {
explorer.position = game.things[game.player_id].position;
- if (this.mode.shows_info) {
- explorer.query_info();
- }
}
this.inputEl.value = "";
this.restore_input_values();
}
} else if (this.mode.is_single_char_entry) {
this.show_help = true;
+ } else if (this.mode.name == 'command_thing') {
+ server.send(['TASK:COMMAND', 'HELP']);
} else if (this.mode.name == 'admin_enter') {
this.log_msg('@ enter admin password:')
} else if (this.mode.name == 'control_pw_type') {
}
},
restore_input_values: function() {
- if (this.mode.name == 'annotate' && explorer.position in explorer.info_db) {
- let info = explorer.info_db[explorer.position];
+ if (this.mode.name == 'annotate' && explorer.position in explorer.annotations) {
+ let info = explorer.annotations[explorer.position];
if (info != "(none)") {
this.inputEl.value = info;
}
this.full_refresh();
},
draw_map: function() {
+ if (!game.turn_complete && this.map_lines.length == 0) {
+ return;
+ }
if (game.turn_complete) {
let map_lines_split = [];
let line = [];
this.offset_links(offset, log_links);
},
draw_info: function() {
- let [lines, link_data] = this.msg_into_lines_of_width(explorer.get_info(),
- this.window_width);
+ const info = "MAP VIEW: " + tui.map_mode + "\n" + explorer.get_info();
+ let [lines, link_data] = this.msg_into_lines_of_width(info, this.window_width);
let offset = [this.height_header, this.window_width];
for (let y = offset[0], i = 0; y < terminal.rows && i < lines.length; y++, i++) {
terminal.write(y, offset[1], lines[i]);
let explorer = {
position: [0,0],
- info_db: {},
- info_hints: [],
+ annotations: {},
+ info_cached: false,
move: function(direction) {
let target = game.move(this.position, direction);
if (target) {
this.position = target
- if (tui.mode.shows_info) {
- this.query_info();
- } else if (tui.tile_draw) {
+ this.info_cached = false;
+ if (tui.tile_draw) {
this.send_tile_control_command();
}
} else {
terminal.blink_screen();
};
},
- update_info_db: function(yx, str) {
- this.info_db[yx] = str;
+ update_annotations: function(yx, str) {
+ this.annotations[yx] = str;
if (tui.mode.name == 'study') {
tui.full_refresh();
}
},
- empty_info_db: function() {
- this.info_db = {};
- this.info_hints = [];
+ empty_annotations: function() {
+ this.annotations = {};
if (tui.mode.name == 'study') {
tui.full_refresh();
}
},
- query_info: function() {
- server.send(["GET_ANNOTATION", unparser.to_yx(explorer.position)]);
- },
get_info: function() {
- let info = "MAP VIEW: " + tui.map_mode + "\n";
+ if (this.info_cached) {
+ return this.info_cached;
+ }
+ let info_to_cache = '';
let position_i = this.position[0] * game.map_size[1] + this.position[1];
if (game.fov[position_i] != '.') {
- return info + 'outside field of view';
- };
- let terrain_char = game.map[position_i]
- let terrain_desc = '?'
- if (game.terrains[terrain_char]) {
- terrain_desc = game.terrains[terrain_char];
- };
- info += 'TERRAIN: "' + terrain_char + '" / ' + terrain_desc + "\n";
- let protection = game.map_control[position_i];
- if (protection == '.') {
- protection = 'unprotected';
- };
- info += 'PROTECTION: ' + protection + '\n';
- for (let t_id in game.things) {
- let t = game.things[t_id];
- if (t.position[0] == this.position[0] && t.position[1] == this.position[1]) {
- let symbol = game.thing_types[t.type_];
- let protection = t.protection;
- if (protection == '.') {
- protection = 'none';
- }
- info += "THING: " + t.type_ + " / " + symbol;
- if (t.thing_char) {
- info += t.thing_char;
- };
- if (t.name_) {
- info += " (" + t.name_ + ")";
- }
- info += " / protection: " + protection + "\n";
- }
- }
- if (this.position in game.portals) {
- info += "PORTAL: " + game.portals[this.position] + "\n";
- }
- if (this.position in this.info_db) {
- info += "ANNOTATIONS: " + this.info_db[this.position];
+ info_to_cache += 'outside field of view';
} else {
- info += 'waiting …';
+ let terrain_char = game.map[position_i]
+ let terrain_desc = '?'
+ if (game.terrains[terrain_char]) {
+ terrain_desc = game.terrains[terrain_char];
+ };
+ info_to_cache += 'TERRAIN: "' + terrain_char + '" / ' + terrain_desc + "\n";
+ let protection = game.map_control[position_i];
+ if (protection == '.') {
+ protection = 'unprotected';
+ };
+ info_to_cache += 'PROTECTION: ' + protection + '\n';
+ for (let t_id in game.things) {
+ let t = game.things[t_id];
+ if (t.position[0] == this.position[0] && t.position[1] == this.position[1]) {
+ let symbol = game.thing_types[t.type_];
+ let protection = t.protection;
+ if (protection == '.') {
+ protection = 'none';
+ }
+ info_to_cache += "THING: " + t.type_ + " / " + symbol;
+ if (t.thing_char) {
+ info_to_cache += t.thing_char;
+ };
+ if (t.name_) {
+ info_to_cache += " (" + t.name_ + ")";
+ }
+ info_to_cache += " / protection: " + protection + "\n";
+ }
+ }
+ if (this.position in game.portals) {
+ info_to_cache += "PORTAL: " + game.portals[this.position] + "\n";
+ }
+ if (this.position in this.annotations) {
+ info_to_cache += "ANNOTATION: " + this.annotations[this.position];
+ }
}
- return info;
+ this.info_cached = info_to_cache;
+ return this.info_cached;
},
annotate: function(msg) {
if (msg.length == 0) {
tui.login_name = tui.inputEl.value;
server.send(['LOGIN', tui.inputEl.value]);
tui.inputEl.value = "";
+ } else if (tui.mode.name == 'command_thing' && event.key == 'Enter') {
+ if (tui.inputEl.value.length == 0) {
+ tui.log_msg('@ aborted');
+ tui.switch_mode('play');
+ } else if (tui.task_action_on('command')) {
+ server.send(['TASK:COMMAND', tui.inputEl.value]);
+ tui.inputEl.value = "";
+ }
} else if (tui.mode.name == 'control_pw_pw' && event.key == 'Enter') {
if (tui.inputEl.value.length == 0) {
tui.log_msg('@ aborted');