X-Git-Url: https://plomlompom.com/repos/condition_titles?a=blobdiff_plain;f=rogue_chat.html;h=3f281579afa8e5dcf0edcaedcc00aad23994303d;hb=e9188b469ca75643cea9dbfd49e7400d060ca06a;hp=23d1a574679c804582021ef1d53b4fe6997e3cfa;hpb=e9314285cc797bad29b3621d713ad2a0703c4d2e;p=plomrogue2
diff --git a/rogue_chat.html b/rogue_chat.html
index 23d1a57..3f28157 100644
--- a/rogue_chat.html
+++ b/rogue_chat.html
@@ -16,9 +16,6 @@ terminal rows:
-
-keyboard input/control:
-
button controls for hard-to-remember keybindings
@@ -72,6 +69,7 @@ keyboard input/control:
+
@@ -107,6 +105,7 @@ keyboard input/control:
(un-)wear:
+
@@ -152,17 +151,17 @@ let mode_helps = {
'long': 'Give name to/change name of thing here.'
},
'command_thing': {
- 'short': 'command thing',
+ 'short': 'command',
'intro': '',
'long': 'Enter a command to the thing you carry. Enter nothing to return to play mode.'
},
'take_thing': {
- 'short': 'take thing',
+ 'short': 'take',
'intro': 'Pick up a thing in reach by entering its index number. Enter nothing to abort.',
'long': 'You see a list of things which you could pick up. Enter the target thing\'s index, or, to leave, nothing.'
},
'drop_thing': {
- 'short': 'drop thing',
+ 'short': 'drop',
'intro': 'Enter number of direction to which you want to drop thing.',
'long': 'Drop currently carried thing by entering the target direction index. Enter nothing to return to play mode..'
},
@@ -172,12 +171,17 @@ let mode_helps = {
'long': 'Change protection character for thing here.'
},
'enter_face': {
- 'short': 'enter your face',
+ 'short': 'edit face',
'intro': '@ enter face line (enter nothing to abort):',
- 'long': 'Draw your face as ASCII art. The string you enter must be 18 characters long, and will be divided on display into 3 lines of 6 characters each, from top to bottom..'
+ 'long': 'Draw your face as ASCII art. The string you enter must be 18 characters long, and will be divided on display into 3 lines of 6 characters each, from top to bottom. Eat cookies to extend the ASCII characters available for drawing.'
+ },
+ 'enter_hat': {
+ 'short': 'edit hat',
+ 'intro': '@ enter hat line (enter nothing to abort):',
+ 'long': 'Draw your hat as ASCII art. The string you enter must be 18 characters long, and will be divided on display into 3 lines of 6 characters each, from top to bottom..'
},
'write': {
- 'short': 'change terrain',
+ 'short': 'edit tile',
'intro': '',
'long': 'This mode allows you to change the map tile you currently stand on (if your world editing password authorizes you so). Just enter any printable ASCII character to imprint it on the ground below you.'
},
@@ -479,29 +483,29 @@ let server = {
let tokens = parser.tokenize(event.data);
if (tokens[0] === 'TURN') {
game.turn_complete = false;
- explorer.empty_annotations();
- game.things = {};
- game.portals = {};
- game.fov = '';
game.turn = parseInt(tokens[1]);
+ } else if (tokens[0] === 'OTHER_WIPE') {
+ game.portals_new = {};
+ explorer.annotations_new = {};
+ game.things_new = [];
} else if (tokens[0] === 'THING') {
- let t = game.get_thing(tokens[4], true);
+ let t = game.get_thing_temp(tokens[4], true);
t.position = parser.parse_yx(tokens[1]);
t.type_ = tokens[2];
t.protection = tokens[3];
t.portable = parseInt(tokens[5]);
t.commandable = parseInt(tokens[6]);
} else if (tokens[0] === 'THING_NAME') {
- let t = game.get_thing(tokens[1], false);
+ let t = game.get_thing_temp(tokens[1]);
t.name_ = tokens[2];
} else if (tokens[0] === 'THING_FACE') {
- let t = game.get_thing(tokens[1], false);
+ let t = game.get_thing_temp(tokens[1]);
t.face = tokens[2];
} else if (tokens[0] === 'THING_HAT') {
- let t = game.get_thing(tokens[1], false);
+ let t = game.get_thing_temp(tokens[1]);
t.hat = tokens[2];
} else if (tokens[0] === 'THING_CHAR') {
- let t = game.get_thing(tokens[1], false);
+ let t = game.get_thing_temp(tokens[1]);
t.thing_char = tokens[2];
} else if (tokens[0] === 'TASKS') {
game.tasks = tokens[1].split(',');
@@ -512,26 +516,35 @@ let server = {
} else if (tokens[0] === 'THING_TYPE') {
game.thing_types[tokens[1]] = tokens[2]
} else if (tokens[0] === 'THING_CARRYING') {
- let t = game.get_thing(tokens[1], false);
+ let t = game.get_thing_temp(tokens[1]);
t.carrying = game.get_thing(tokens[2], false);
} else if (tokens[0] === 'THING_INSTALLED') {
- let t = game.get_thing(tokens[1], false);
+ let t = game.get_thing_temp(tokens[1]);
t.installed = true;
} else if (tokens[0] === 'TERRAIN') {
game.terrains[tokens[1]] = tokens[2]
} else if (tokens[0] === 'MAP') {
- game.map_geometry = tokens[1];
- tui.init_keys();
- game.map_size = parser.parse_yx(tokens[2]);
- game.map = tokens[3]
+ game.map_geometry_new = tokens[1];
+ game.map_size_new = parser.parse_yx(tokens[2]);
+ game.map_new = tokens[3]
} else if (tokens[0] === 'FOV') {
- game.fov = tokens[1]
+ game.fov_new = tokens[1]
} else if (tokens[0] === 'MAP_CONTROL') {
- game.map_control = tokens[1]
+ game.map_control_new = tokens[1]
} else if (tokens[0] === 'GAME_STATE_COMPLETE') {
- game.turn_complete = true;
- game.player = game.things[game.player_id];
+ game.portals = game.portals_new;
+ game.map_geometry = game.map_geometry_new;
+ game.map_size = game.map_size_new;
+ game.map = game.map_new;
+ game.fov = game.fov_new;
+ tui.init_keys();
+ game.map_control = game.map_control_new;
+ explorer.annotations = explorer.annotations_new;
explorer.info_cached = false;
+ game.things = game.things_new;
+ game.player = game.things[game.player_id];
+ game.players_hat_chars = game.players_hat_chars_new;
+ game.turn_complete = true;
if (tui.mode.name == 'post_login_wait') {
tui.switch_mode('play');
} else {
@@ -546,6 +559,8 @@ let server = {
tui.log_msg('#MUSICPLAYER: ' + tokens[1], 1);
} else if (tokens[0] === 'PLAYER_ID') {
game.player_id = parseInt(tokens[1]);
+ } else if (tokens[0] === 'PLAYERS_HAT_CHARS') {
+ game.players_hat_chars_new = tokens[1];
} else if (tokens[0] === 'LOGIN_OK') {
this.send(['GET_GAMESTATE']);
tui.switch_mode('post_login_wait');
@@ -559,11 +574,10 @@ let server = {
tui.switch_mode('admin');
} else if (tokens[0] === 'PORTAL') {
let position = parser.parse_yx(tokens[1]);
- game.portals[position] = tokens[2];
+ game.portals_new[position] = tokens[2];
} else if (tokens[0] === 'ANNOTATION') {
let position = parser.parse_yx(tokens[1]);
- explorer.update_annotations(position, tokens[2]);
- tui.full_refresh();
+ explorer.annotations_new[position] = tokens[2];
} else if (tokens[0] === 'UNHANDLED_INPUT') {
tui.log_msg('? unknown command');
} else if (tokens[0] === 'PLAY_ERROR') {
@@ -684,6 +698,7 @@ let tui = {
mode_take_thing: new Mode('take_thing', true),
mode_drop_thing: new Mode('drop_thing', true),
mode_enter_face: new Mode('enter_face', true),
+ mode_enter_hat: new Mode('enter_hat', true),
mode_admin_enter: new Mode('admin_enter', true),
mode_admin: new Mode('admin'),
mode_control_pw_pw: new Mode('control_pw_pw', true),
@@ -703,6 +718,8 @@ let tui = {
},
offset: [0,0],
map_lines: [],
+ ascii_draw_stage: 0,
+ full_ascii_draw: '',
selectables: [],
draw_face: false,
init: function() {
@@ -720,11 +737,10 @@ let tui = {
this.mode_control_tile_draw.available_actions = ["toggle_tile_draw"];
this.mode_edit.available_modes = ["write", "annotate", "portal", "name_thing",
"password", "chat", "study", "play",
- "admin_enter", "enter_face"]
+ "admin_enter", "enter_face", "enter_hat"]
this.mode_edit.available_actions = ["move", "flatten", "install",
"toggle_map_mode"]
this.inputEl = document.getElementById("input");
- this.inputEl.focus();
this.switch_mode('waiting_for_server');
this.recalc_input_lines();
this.height_header = this.height_turn_line + this.height_mode_line;
@@ -780,15 +796,15 @@ let tui = {
}
this.draw_face = false;
this.tile_draw = false;
- if (mode_name == 'command_thing' && (!game.player.carrying
- || !game.player.carrying.commandable)) {
+ if (mode_name == 'command_thing' && (!game.player.carrying
+ || !game.player.carrying.commandable)) {
return fail('not carrying anything commandable', 'play');
- };
- if (mode_name == 'take_thing' && game.player.carrying) {
+ } else if (mode_name == 'take_thing' && game.player.carrying) {
return fail('already carrying something', 'play');
- };
- if (mode_name == 'drop_thing' && !game.player.carrying) {
+ } else if (mode_name == 'drop_thing' && !game.player.carrying) {
return fail('not carrying anything droppable', 'play');
+ } else if (mode_name == 'enter_hat' && !game.player.hat) {
+ return fail('not wearing hat to edit', 'edit');
}
if (mode_name == 'admin_enter' && this.is_admin) {
mode_name = 'admin';
@@ -817,9 +833,6 @@ let tui = {
} else if (this.mode.name != "edit") {
this.map_mode = 'terrain + things';
};
- if (this.mode.has_input_prompt || this.mode.is_single_char_entry) {
- this.inputEl.focus();
- }
if (game.player_id in game.things && (this.mode.shows_info || this.mode.name == 'control_tile_draw')) {
explorer.position = game.player.position;
}
@@ -900,6 +913,8 @@ let tui = {
for (let [i, direction] of this.selectables.entries()) {
this.log_msg(i + ': ' + direction);
};
+ } else if (this.mode.name == 'enter_hat') {
+ this.log_msg('legal characters: ' + game.players_hat_chars);
} else if (this.mode.name == 'command_thing') {
server.send(['TASK:COMMAND', 'HELP']);
} else if (this.mode.name == 'control_pw_pw') {
@@ -942,6 +957,14 @@ let tui = {
if (t && t.protection) {
this.inputEl.value = t.protection;
}
+ } else if (['enter_face', 'enter_hat'].includes(this.mode.name)) {
+ const start = this.ascii_draw_stage * 6;
+ const end = (this.ascii_draw_stage + 1) * 6;
+ if (this.mode.name == 'enter_face') {
+ this.inputEl.value = game.player.face.slice(start, end);
+ } else if (this.mode.name == 'enter_hat') {
+ this.inputEl.value = game.player.hat.slice(start, end);
+ }
}
},
recalc_input_lines: function() {
@@ -1030,6 +1053,24 @@ let tui = {
this.inputEl.value = "";
this.switch_mode('play');
},
+ enter_ascii_art: function(command) {
+ if (this.inputEl.value.length != 6) {
+ this.log_msg('? wrong input length, try again');
+ return;
+ }
+ this.log_msg(' ' + this.inputEl.value);
+ this.full_ascii_draw += this.inputEl.value;
+ this.ascii_draw_stage += 1;
+ if (this.ascii_draw_stage < 3) {
+ this.restore_input_values();
+ } else {
+ server.send([command, this.full_ascii_draw]);
+ this.full_ascii_draw = '';
+ this.ascii_draw_stage = 0;
+ this.inputEl.value = '';
+ this.switch_mode('edit');
+ }
+ },
draw_map: function() {
if (!game.turn_complete && this.map_lines.length == 0) {
return;
@@ -1139,8 +1180,12 @@ let tui = {
return;
}
const start_x = tui.window_width - 10;
+ let t_char = ' ';
+ if (t.thing_char) {
+ t_char = t.thing_char;
+ }
function draw_body_part(body_part, end_y) {
- terminal.write(end_y - 4, start_x, ' ________ ');
+ terminal.write(end_y - 4, start_x, ' _[ @' + t_char + ' ]_ ');
terminal.write(end_y - 3, start_x, '| |');
terminal.write(end_y - 2, start_x, '| ' + body_part.slice(0, 6) + ' |');
terminal.write(end_y - 1, start_x, '| ' + body_part.slice(6, 12) + ' |');
@@ -1303,24 +1348,37 @@ let tui = {
let game = {
init: function() {
- this.things = {};
this.turn = -1;
+ this.player_id = -1;
+ this.tasks = {};
+ this.things = {};
+ this.things_new = {};
+ this.fov = "";
+ this.fov_new = "";
this.map = "";
+ this.map_new = "";
this.map_control = "";
+ this.map_control_new = "";
this.map_size = [0,0];
- this.player_id = -1;
+ this.map_size_new = [0,0];
this.portals = {};
- this.tasks = {};
+ this.portals_new = {};
+ this.players_hat_chars = "";
},
- get_thing: function(id_, create_if_not_found=false) {
- if (id_ in game.things) {
- return game.things[id_];
+ get_thing_temp: function(id_, create_if_not_found=false) {
+ if (id_ in game.things_new) {
+ return game.things_new[id_];
} else if (create_if_not_found) {
let t = new Thing([0,0]);
- game.things[id_] = t;
+ game.things_new[id_] = t;
return t;
};
},
+ get_thing: function(id_, create_if_not_found=false) {
+ if (id_ in game.things) {
+ return game.things[id_];
+ };
+ },
move: function(start_position, direction) {
let target = [start_position[0], start_position[1]];
if (direction == 'LEFT') {
@@ -1381,6 +1439,7 @@ server.init(websocket_location);
let explorer = {
position: [0,0],
annotations: {},
+ annotations_new: {},
info_cached: false,
move: function(direction) {
let target = game.move(this.position, direction);
@@ -1394,18 +1453,6 @@ let explorer = {
terminal.blink_screen();
};
},
- update_annotations: function(yx, str) {
- this.annotations[yx] = str;
- if (tui.mode.name == 'study') {
- tui.full_refresh();
- }
- },
- empty_annotations: function() {
- this.annotations = {};
- if (tui.mode.name == 'study') {
- tui.full_refresh();
- }
- },
get_info: function() {
if (this.info_cached) {
return this.info_cached;
@@ -1501,7 +1548,9 @@ tui.inputEl.addEventListener('input', (event) => {
tui.full_refresh();
}, false);
document.onclick = function() {
- tui.show_help = false;
+ if (!tui.mode.is_single_char_entry) {
+ tui.show_help = false;
+ }
};
tui.inputEl.addEventListener('keydown', (event) => {
tui.show_help = false;
@@ -1529,13 +1578,9 @@ tui.inputEl.addEventListener('keydown', (event) => {
server.send(['LOGIN', tui.inputEl.value]);
tui.inputEl.value = "";
} else if (tui.mode.name == 'enter_face' && event.key == 'Enter') {
- if (tui.inputEl.value.length != 18) {
- tui.log_msg('? wrong input length, aborting');
- } else {
- server.send(['PLAYER_FACE', tui.inputEl.value]);
- }
- tui.inputEl.value = "";
- tui.switch_mode('edit');
+ tui.enter_ascii_art('PLAYER_FACE');
+ } else if (tui.mode.name == 'enter_hat' && event.key == 'Enter') {
+ tui.enter_ascii_art('PLAYER_HAT');
} else if (tui.mode.name == 'command_thing' && event.key == 'Enter') {
server.send(['TASK:COMMAND', tui.inputEl.value]);
tui.inputEl.value = "";
@@ -1704,22 +1749,13 @@ window.setInterval(function() {
}
}, 1000);
window.setInterval(function() {
- let val = "?";
- let span_decoration = "none";
- if (document.activeElement == tui.inputEl) {
- val = "on (click outside terminal to change)";
- } else {
- val = "off (click into terminal to change)";
- span_decoration = "line-through";
+ if (document.activeElement.tagName.toLowerCase() != 'input') {
+ const scroll_x = window.scrollX;
+ const scroll_y = window.scrollY;
+ tui.inputEl.focus();
+ window.scrollTo(scroll_x, scroll_y);
};
- document.getElementById("keyboard_control").textContent = val;
- for (const span of document.querySelectorAll('.keyboard_controlled')) {
- span.style.textDecoration = span_decoration;
- }
}, 100);
-document.getElementById("terminal").onclick = function() {
- tui.inputEl.focus();
-};
document.getElementById("help").onclick = function() {
tui.show_help = true;
tui.full_refresh();
@@ -1748,7 +1784,7 @@ document.getElementById("consume").onclick = function() {
server.send(['TASK:INTOXICATE']);
};
document.getElementById("install").onclick = function() {
- server.send(['TASK:INSTALL']);
+ server.send(['TASK:INSTALL', tui.password]);
};
document.getElementById("wear").onclick = function() {
server.send(['TASK:WEAR']);
@@ -1764,14 +1800,20 @@ for (const move_button of document.querySelectorAll('[id*="_move_"]')) {
continue;
};
let direction = move_button.id.split('_')[2].toUpperCase();
- move_button.onclick = function() {
- if (tui.mode.available_actions.includes("move")) {
- server.send(['TASK:MOVE', direction]);
- } else if (tui.mode.available_actions.includes("move_explorer")) {
- explorer.move(direction);
- tui.full_refresh();
- };
+ let move_repeat;
+ move_button.onmousedown = function() {
+ move_repeat = window.setInterval(function() {
+ if (tui.mode.available_actions.includes("move")) {
+ server.send(['TASK:MOVE', direction]);
+ } else if (tui.mode.available_actions.includes("move_explorer")) {
+ explorer.move(direction);
+ tui.full_refresh();
+ };
+ }, 100);
};
+ move_button.onmouseup = function() {
+ window.clearInterval(move_repeat);
+ }
};