X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=rogue_chat.html;h=4285ded541ea1912fd83f36ba37337761407f074;hb=aab94ffb12aa0dedc240d7b29001699b95c49249;hp=f47cf129c70bd522f7ae4f84e0e96c6ca350e405;hpb=a1e6857395d1003538a635f2cfba102459314f2b;p=plomrogue2
diff --git a/rogue_chat.html b/rogue_chat.html
index f47cf12..4285ded 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:
+
@@ -176,6 +175,11 @@ let mode_helps = {
'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..'
},
+ 'enter_hat': {
+ 'short': 'enter your 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',
'intro': '',
@@ -480,6 +484,10 @@ let server = {
if (tokens[0] === 'TURN') {
game.turn_complete = false;
game.turn = parseInt(tokens[1]);
+ } else if (tokens[0] === 'PSEUDO_FOV_WIPE') {
+ game.portals_new = {};
+ explorer.annotations_new = {};
+ game.things_new = [];
} else if (tokens[0] === 'THING') {
let t = game.get_thing_temp(tokens[4], true);
t.position = parser.parse_yx(tokens[1]);
@@ -517,7 +525,6 @@ let server = {
game.terrains[tokens[1]] = tokens[2]
} else if (tokens[0] === 'MAP') {
game.map_geometry_new = tokens[1];
- tui.init_keys();
game.map_size_new = parser.parse_yx(tokens[2]);
game.map_new = tokens[3]
} else if (tokens[0] === 'FOV') {
@@ -525,19 +532,19 @@ let server = {
} else if (tokens[0] === 'MAP_CONTROL') {
game.map_control_new = tokens[1]
} else if (tokens[0] === 'GAME_STATE_COMPLETE') {
- game.turn_complete = true;
game.portals = game.portals_new;
- 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.annotations_new = {};
explorer.info_cached = false;
game.things = game.things_new;
- 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 {
@@ -552,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');
@@ -689,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),
@@ -725,11 +735,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;
@@ -822,9 +831,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;
}
@@ -1327,6 +1333,7 @@ let game = {
this.map_size_new = [0,0];
this.portals = {};
this.portals_new = {};
+ this.players_hat_chars = "";
},
get_thing_temp: function(id_, create_if_not_found=false) {
if (id_ in game.things_new) {
@@ -1511,7 +1518,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;
@@ -1546,6 +1555,14 @@ tui.inputEl.addEventListener('keydown', (event) => {
}
tui.inputEl.value = "";
tui.switch_mode('edit');
+ } else if (tui.mode.name == 'enter_hat' && event.key == 'Enter') {
+ if (tui.inputEl.value.length != 18) {
+ tui.log_msg('? wrong input length, aborting');
+ } else {
+ server.send(['PLAYER_HAT', tui.inputEl.value]);
+ }
+ tui.inputEl.value = "";
+ tui.switch_mode('edit');
} else if (tui.mode.name == 'command_thing' && event.key == 'Enter') {
server.send(['TASK:COMMAND', tui.inputEl.value]);
tui.inputEl.value = "";
@@ -1714,22 +1731,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();
@@ -1774,14 +1782,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);
+ }
};