X-Git-Url: https://plomlompom.com/repos/new_day?a=blobdiff_plain;f=rogue_chat.html;h=d865516eaad3d93054f99e7611cda281f1a85964;hb=49741de058b5320f181c69894da6dbdac2a6fa8d;hp=59d03a98141cda17de586e956b1abd6d88bf8dff;hpb=2b771f8e84f26be608161b79e19fa255a0832c67;p=plomrogue2
diff --git a/rogue_chat.html b/rogue_chat.html
index 59d03a9..d865516 100644
--- a/rogue_chat.html
+++ b/rogue_chat.html
@@ -42,34 +42,36 @@ terminal columns:
|
+
|
+ |
|
-
-
- |
- |
- |
-
-
- |
- |
- |
-
-
- |
- |
- |
-
-
- |
- |
-
-
+
+
+
|
+
+ |
+
+
+
+
+
+
+ |
+
+
+ |
+
+
+
+ |
+
+
edit keybindings
(see here for non-obvious available values):
@@ -91,9 +93,10 @@ terminal columns:
-
-
-
-
-
+
-
+
-
-
-
-
+
-
-
-
-
@@ -115,7 +118,11 @@ let mode_helps = {
'short': 'study',
'long': '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.'},
'edit': {
- 'short': 'terrain edit',
+ 'short': 'map edit',
+ 'long': 'This mode allows you to change the map in various ways.'
+ },
+ 'write': {
+ 'short': 'terrain write',
'long': '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.'
},
'control_pw_type': {
@@ -162,9 +169,13 @@ let mode_helps = {
'short': 'map edit password',
'long': 'This mode allows you to change the password that you send to authorize yourself for editing password-protected map tiles. Hit return to confirm and leave.'
},
- 'admin': {
+ 'admin_enter': {
'short': 'become admin',
'long': 'This mode allows you to become admin if you know an admin password.'
+ },
+ 'admin': {
+ 'short': 'admin',
+ 'long': 'This mode allows you access to actions limited to administrators.'
}
}
@@ -380,7 +391,7 @@ let server = {
};
} else if (tokens[0] === 'TASKS') {
game.tasks = tokens[1].split(',');
- tui.mode_edit.legal = game.tasks.includes('WRITE');
+ tui.mode_write.legal = game.tasks.includes('WRITE');
} else if (tokens[0] === 'THING_TYPE') {
game.thing_types[tokens[1]] = tokens[2]
} else if (tokens[0] === 'TERRAIN') {
@@ -409,6 +420,10 @@ let server = {
} else if (tokens[0] === 'LOGIN_OK') {
this.send(['GET_GAMESTATE']);
tui.switch_mode('post_login_wait');
+ } else if (tokens[0] === 'ADMIN_OK') {
+ tui.is_admin = true;
+ tui.log_msg('@ you now have admin rights');
+ tui.switch_mode('admin');
} else if (tokens[0] === 'PORTAL') {
let position = parser.parse_yx(tokens[1]);
game.portals[position] = tokens[2];
@@ -517,6 +532,7 @@ let tui = {
height_input: 1,
password: 'foo',
show_help: false,
+ is_admin: false,
mode_waiting_for_server: new Mode('waiting_for_server',
false, false, true),
mode_login: new Mode('login', true, false, true),
@@ -525,24 +541,28 @@ let tui = {
mode_annotate: new Mode('annotate', true, true),
mode_play: new Mode('play'),
mode_study: new Mode('study', false, true),
- mode_edit: new Mode('edit', false, false, false, true),
+ mode_write: new Mode('write', false, false, false, true),
+ mode_edit: new Mode('edit'),
mode_control_pw_type: new Mode('control_pw_type',
false, false, false, true),
mode_portal: new Mode('portal', true, true),
mode_password: new Mode('password', true),
- mode_admin: new Mode('admin', true),
+ mode_admin_enter: new Mode('admin_enter', true),
+ mode_admin: new Mode('admin'),
mode_control_pw_pw: new Mode('control_pw_pw', true),
mode_control_tile_type: new Mode('control_tile_type',
false, false, false, true),
mode_control_tile_draw: new Mode('control_tile_draw'),
init: function() {
- this.mode_play.available_modes = ["chat", "study", "edit",
- "annotate", "portal",
- "password", "admin",
- "control_pw_type",
- "control_tile_type"]
- this.mode_study.available_modes = ["chat", "play"]
- this.mode_control_tile_draw.available_modes = ["play"]
+ this.mode_play.available_modes = ["chat", "study", "edit", "admin_enter"]
+ this.mode_study.available_modes = ["chat", "play", "admin_enter", "edit"]
+ this.mode_admin.available_modes = ["control_pw_type",
+ "control_tile_type", "chat",
+ "study", "play", "edit"]
+ this.mode_control_tile_draw.available_modes = ["admin"]
+ this.mode_edit.available_modes = ["write", "annotate", "portal",
+ "password", "chat", "study", "play",
+ "admin_enter"]
this.mode = this.mode_waiting_for_server;
this.inputEl = document.getElementById("input");
this.inputEl.focus();
@@ -589,6 +609,9 @@ let tui = {
switch_mode: function(mode_name) {
this.inputEl.focus();
this.map_mode = 'terrain';
+ if (mode_name == 'admin_enter' && this.is_admin) {
+ mode_name = 'admin';
+ };
this.mode = this['mode_' + mode_name];
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;
@@ -605,7 +628,7 @@ let tui = {
el.disabled = true;
}
document.getElementById("help").disabled = false;
- if (this.mode.name == 'play' || this.mode.name == 'study' || this.mode.name == 'control_tile_draw') {
+ if (this.mode.name == 'play' || this.mode.name == 'study' || this.mode.name == 'control_tile_draw' || this.mode.name == 'edit') {
for (const move_key of document.querySelectorAll('[id^="move_"]')) {
move_key.disabled = false;
}
@@ -619,6 +642,12 @@ let tui = {
if (!this.mode.is_intro && this.mode.name != 'chat') {
document.getElementById("switch_to_chat").disabled = false;
}
+ if (!this.mode.is_intro && this.mode.name != 'edit') {
+ document.getElementById("switch_to_edit").disabled = false;
+ }
+ if (!this.mode.is_intro && this.mode.name != 'admin' && this.mode.name != 'admin_enter') {
+ document.getElementById("switch_to_admin_enter").disabled = false;
+ }
if (this.mode.name == 'login') {
if (this.login_name) {
server.send(['LOGIN', this.login_name]);
@@ -632,24 +661,25 @@ let tui = {
if (game.tasks.includes('DROP')) {
document.getElementById("drop_thing").disabled = false;
}
- if (game.tasks.includes('FLATTEN_SURROUNDINGS')) {
- document.getElementById("flatten").disabled = false;
- }
if (game.tasks.includes('MOVE')) {
}
document.getElementById("teleport").disabled = false;
+ } else if (this.mode.name == 'edit') {
+ if (game.tasks.includes('FLATTEN_SURROUNDINGS')) {
+ document.getElementById("flatten").disabled = false;
+ }
document.getElementById("switch_to_annotate").disabled = false;
- document.getElementById("switch_to_edit").disabled = false;
+ document.getElementById("switch_to_write").disabled = false;
document.getElementById("switch_to_portal").disabled = false;
document.getElementById("switch_to_password").disabled = false;
- document.getElementById("switch_to_admin").disabled = false;
+ } else if (this.mode.name == 'admin') {
document.getElementById("switch_to_control_pw_type").disabled = false;
document.getElementById("switch_to_control_tile_type").disabled = false;
} else if (this.mode.name == 'study') {
document.getElementById("toggle_map_mode").disabled = false;
} else if (this.mode.is_single_char_entry) {
this.show_help = true;
- } else if (this.mode.name == 'admin') {
+ } else if (this.mode.name == 'admin_enter') {
this.log_msg('@ enter admin password:')
} else if (this.mode.name == 'control_pw_pw') {
this.log_msg('@ enter tile control password for "' + this.tile_control_char + '":');
@@ -784,7 +814,8 @@ let tui = {
} else if (this.map_mode == 'terrain') {
for (const p in game.portals) {
let coordinate = p.split(',')
- map_lines_split[coordinate[0]][coordinate[1]] = 'P ';
+ let original = map_lines_split[coordinate[0]][coordinate[1]];
+ map_lines_split[coordinate[0]][coordinate[1]] = original[0] + 'P';
}
let used_positions = [];
for (const thing_id in game.things) {
@@ -908,13 +939,10 @@ let tui = {
content += "[" + movement_keys_desc + "] â move player\n";
}
if (game.tasks.includes('PICK_UP')) {
- content += "[" + this.keys.take_thing + "] â take thing under player\n";
+ content += "[" + this.keys.take_thing + "] â pick up thing\n";
}
if (game.tasks.includes('DROP')) {
- content += "[" + this.keys.drop_thing + "] â drop carried thing\n";
- }
- if (game.tasks.includes('FLATTEN_SURROUNDINGS')) {
- content += "[" + tui.keys.flatten + "] â flatten player's surroundings\n";
+ content += "[" + this.keys.drop_thing + "] â drop picked up thing\n";
}
content += "[" + tui.keys.teleport + "] â teleport to other space\n";
content += '\n';
@@ -923,10 +951,18 @@ let tui = {
content += '[' + movement_keys_desc + '] â move question mark\n';
content += '[' + this.keys.toggle_map_mode + '] â toggle view between terrain, annotations, and password protection areas\n';
content += '\n';
+ } else if (this.mode.name == 'edit') {
+ content += "Available actions:\n";
+ if (game.tasks.includes('FLATTEN_SURROUNDINGS')) {
+ content += "[" + tui.keys.flatten + "] â flatten player's surroundings\n";
+ }
+ content += '\n';
} else if (this.mode.name == 'chat') {
content += '/nick NAME â re-name yourself to NAME\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';
+ content += '/' + this.keys.switch_to_edit + ' or /edit â switch to map edit mode\n';
+ content += '/' + this.keys.switch_to_admin_enter + ' or /admin â switch to admin mode\n';
}
content += this.mode.list_available_modes();
let start_x = 0;
@@ -1141,9 +1177,9 @@ tui.inputEl.addEventListener('input', (event) => {
tui.inputEl.value = tui.inputEl.value.slice(0, max_length);
};
tui.recalc_input_lines();
- } else if (tui.mode.name == 'edit' && tui.inputEl.value.length > 0) {
+ } else if (tui.mode.name == 'write' && tui.inputEl.value.length > 0) {
server.send(["TASK:WRITE", tui.inputEl.value[0], tui.password]);
- tui.switch_mode('play');
+ tui.switch_mode('edit');
} else if (tui.mode.name == 'control_pw_type' && tui.inputEl.value.length > 0) {
tui.tile_control_char = tui.inputEl.value[0];
tui.switch_mode('control_pw_pw');
@@ -1176,20 +1212,20 @@ tui.inputEl.addEventListener('keydown', (event) => {
server.send(['SET_MAP_CONTROL_PASSWORD',
tui.tile_control_char, tui.inputEl.value]);
}
- tui.switch_mode('play');
+ tui.switch_mode('admin');
} else if (tui.mode.name == 'portal' && event.key == 'Enter') {
explorer.set_portal(tui.inputEl.value);
- tui.switch_mode('play');
+ tui.switch_mode('edit');
} else if (tui.mode.name == 'annotate' && event.key == 'Enter') {
explorer.annotate(tui.inputEl.value);
- tui.switch_mode('play');
+ tui.switch_mode('edit');
} else if (tui.mode.name == 'password' && event.key == 'Enter') {
if (tui.inputEl.value.length == 0) {
tui.inputEl.value = " ";
}
tui.password = tui.inputEl.value
- tui.switch_mode('play');
- } else if (tui.mode.name == 'admin' && event.key == 'Enter') {
+ tui.switch_mode('edit');
+ } else if (tui.mode.name == 'admin_enter' && event.key == 'Enter') {
server.send(['BECOME_ADMIN', tui.inputEl.value]);
tui.switch_mode('play');
} else if (tui.mode.name == 'chat' && event.key == 'Enter') {
@@ -1200,6 +1236,10 @@ tui.inputEl.addEventListener('keydown', (event) => {
tui.switch_mode('play');
} else if (tokens[0].slice(1) == 'study' || tokens[0][1] == tui.keys.switch_to_study) {
tui.switch_mode('study');
+ } else if (tokens[0].slice(1) == 'edit' || tokens[0][1] == tui.keys.switch_to_edit) {
+ tui.switch_mode('edit');
+ } else if (tokens[0].slice(1) == 'admin' || tokens[0][1] == tui.keys.switch_to_admin_enter) {
+ tui.switch_mode('admin_enter');
} else if (tokens[0].slice(1) == 'nick') {
if (tokens.length > 1) {
server.send(['NICK', tokens[1]]);
@@ -1219,9 +1259,6 @@ tui.inputEl.addEventListener('keydown', (event) => {
} else if (tui.mode.name == 'play') {
if (tui.mode.mode_switch_on_key(event)) {
null;
- } else if (event.key === tui.keys.flatten
- && game.tasks.includes('FLATTEN_SURROUNDINGS')) {
- server.send(["TASK:FLATTEN_SURROUNDINGS", tui.password]);
} else if (event.key === tui.keys.take_thing
&& game.tasks.includes('PICK_UP')) {
server.send(["TASK:PICK_UP"]);
@@ -1233,12 +1270,6 @@ tui.inputEl.addEventListener('keydown', (event) => {
server.send(['TASK:MOVE', tui.movement_keys[event.key]]);
} else if (event.key === tui.keys.teleport) {
game.teleport();
- } else if (event.key === tui.keys.switch_to_portal) {
- event.preventDefault();
- tui.switch_mode('portal');
- } else if (event.key === tui.keys.switch_to_annotate) {
- event.preventDefault();
- tui.switch_mode('annotate');
};
} else if (tui.mode.name == 'study') {
if (tui.mode.mode_switch_on_key(event)) {
@@ -1260,6 +1291,20 @@ tui.inputEl.addEventListener('keydown', (event) => {
} else if (event.key in tui.movement_keys) {
explorer.move(tui.movement_keys[event.key]);
};
+ } else if (tui.mode.name == 'admin') {
+ if (tui.mode.mode_switch_on_key(event)) {
+ null;
+ };
+ } else if (tui.mode.name == 'edit') {
+ if (tui.mode.mode_switch_on_key(event)) {
+ null;
+ } else if (event.key in tui.movement_keys
+ && game.tasks.includes('MOVE')) {
+ server.send(['TASK:MOVE', tui.movement_keys[event.key]]);
+ } else if (event.key === tui.keys.flatten
+ && game.tasks.includes('FLATTEN_SURROUNDINGS')) {
+ server.send(["TASK:FLATTEN_SURROUNDINGS", tui.password]);
+ }
}
tui.full_refresh();
}, false);
@@ -1302,45 +1347,12 @@ document.getElementById("help").onclick = function() {
tui.show_help = true;
tui.full_refresh();
};
-document.getElementById("switch_to_play").onclick = function() {
- tui.switch_mode('play');
- tui.full_refresh();
-};
-document.getElementById("switch_to_study").onclick = function() {
- tui.switch_mode('study');
- tui.full_refresh();
-};
-document.getElementById("switch_to_chat").onclick = function() {
- tui.switch_mode('chat');
- tui.full_refresh();
-};
-document.getElementById("switch_to_password").onclick = function() {
- tui.switch_mode('password');
- tui.full_refresh();
-};
-document.getElementById("switch_to_edit").onclick = function() {
- tui.switch_mode('edit');
- tui.full_refresh();
-};
-document.getElementById("switch_to_annotate").onclick = function() {
- tui.switch_mode('annotate');
- tui.full_refresh();
-};
-document.getElementById("switch_to_portal").onclick = function() {
- tui.switch_mode('portal');
- tui.full_refresh();
-};
-document.getElementById("switch_to_admin").onclick = function() {
- tui.switch_mode('admin');
- tui.full_refresh();
-};
-document.getElementById("switch_to_control_pw_type").onclick = function() {
- tui.switch_mode('control_pw_type');
- tui.full_refresh();
-};
-document.getElementById("switch_to_control_tile_type").onclick = function() {
- tui.switch_mode('control_tile_type');
- tui.full_refresh();
+for (const switchEl of document.querySelectorAll('[id^="switch_to_"]')) {
+ const mode = switchEl.id.slice("switch_to_".length);
+ switchEl.onclick = function() {
+ tui.switch_mode(mode);
+ tui.full_refresh();
+ }
};
document.getElementById("toggle_map_mode").onclick = function() {
if (tui.map_mode == 'terrain') {