X-Git-Url: https://plomlompom.com/repos/new_day?a=blobdiff_plain;f=rogue_chat.html;h=cc505bc9af9dd1a4909739c0ee40f5e69b6bd4fe;hb=0d1c7bab88cdc052e3de28a1b1bd67813c721d03;hp=3825581359fa615777a3a6709479eb8ccbe593bf;hpb=33adc215597b0fd7553661891a3c84ce16f1955e;p=plomrogue2
diff --git a/rogue_chat.html b/rogue_chat.html
index 3825581..cc505bc 100644
--- a/rogue_chat.html
+++ b/rogue_chat.html
@@ -22,58 +22,60 @@ keyboard input/control:
button controls for mouse players
- |
- |
- |
+ |
+ |
+ |
- |
+ |
move |
- |
+ |
- |
- |
- |
+ |
+ |
+ |
- |
+ |
-
|
+
|
- |
-
+ | |
+
|
- |
+ |
-
-
-
+
+
+
+
+
|
- |
+ |
-
-
-
-
-
-
+
+
+
+
+
+
|
- |
+ |
-
-
-
-
+
+
+
+
|
@@ -95,6 +97,8 @@ keyboard input/control:
teleport:
pick up thing:
drop thing:
+open/close:
+consume:
@@ -200,6 +204,8 @@ let key_descriptions = {
'teleport': 'teleport',
'take_thing': 'pick up thing',
'drop_thing': 'drop thing',
+ 'door': 'open/close',
+ 'consume': 'consume',
'toggle_map_mode': 'toggle map view',
'toggle_tile_draw': 'toggle protection character drawing',
'hex_move_upleft': 'up-left',
@@ -248,14 +254,12 @@ function escapeHTML(str) {
};
let terminal = {
- foreground: 'white',
- background: 'black',
initialize: function() {
this.rows = rows_selector.value;
this.cols = cols_selector.value;
this.pre_el = document.getElementById("terminal");
- this.pre_el.style.color = this.foreground;
- this.pre_el.style.backgroundColor = this.background;
+ this.set_default_colors();
+ this.apply_colors();
this.content = [];
let line = []
for (let y = 0, x = 0; y <= this.rows; x++) {
@@ -271,6 +275,23 @@ let terminal = {
line.push(' ');
}
},
+ apply_colors: function() {
+ this.pre_el.style.color = this.foreground;
+ this.pre_el.style.backgroundColor = this.background;
+ },
+ set_default_colors: function() {
+ this.foreground = 'white';
+ this.background = 'black';
+ this.apply_colors();
+ },
+ set_random_colors: function() {
+ function rand(offset) {
+ return Math.floor(offset + Math.random() * 96).toString(16).padStart(2, '0');
+ }
+ this.foreground = '#' + rand(159) + rand(159) + rand(159);
+ this.background = '#' + rand(0) + rand(0) + rand(0);
+ this.apply_colors();
+ },
blink_screen: function() {
this.pre_el.style.color = this.background;
this.pre_el.style.backgroundColor = this.foreground;
@@ -427,7 +448,7 @@ let server = {
} else if (tokens[0] === 'THING_CHAR') {
let t = game.get_thing(tokens[1], false);
if (t) {
- t.player_char = tokens[2];
+ t.thing_char = tokens[2];
};
} else if (tokens[0] === 'TASKS') {
game.tasks = tokens[1].split(',');
@@ -460,6 +481,10 @@ let server = {
} else if (tokens[0] === 'LOGIN_OK') {
this.send(['GET_GAMESTATE']);
tui.switch_mode('post_login_wait');
+ } else if (tokens[0] === 'DEFAULT_COLORS') {
+ terminal.set_default_colors();
+ } else if (tokens[0] === 'RANDOM_COLORS') {
+ terminal.set_random_colors();
} else if (tokens[0] === 'ADMIN_OK') {
tui.is_admin = true;
tui.log_msg('@ you now have admin rights');
@@ -599,11 +624,16 @@ let tui = {
'take_thing': 'PICK_UP',
'drop_thing': 'DROP',
'move': 'MOVE',
+ 'door': 'DOOR',
+ '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_actions = ["move", "take_thing", "drop_thing", "teleport"];
+ this.mode_play.available_actions = ["move", "take_thing", "drop_thing",
+ "teleport", "door", "consume"];
this.mode_study.available_modes = ["chat", "play", "admin_enter", "edit"]
this.mode_study.available_actions = ["toggle_map_mode", "move_explorer"];
this.mode_admin.available_modes = ["admin_thing_protect", "control_pw_type",
@@ -643,6 +673,9 @@ let tui = {
}
};
for (const move_button of document.querySelectorAll('[id*="_move_"]')) {
+ if (move_button.id.startsWith('key_')) {
+ continue;
+ }
move_button.hidden = true;
};
for (const move_button of document.querySelectorAll('[id^="' + geometry_prefix + 'move_"]')) {
@@ -858,85 +891,87 @@ let tui = {
this.full_refresh();
},
draw_map: function() {
- let map_lines_split = [];
- let line = [];
- for (let i = 0, j = 0; i < game.map.length; i++, j++) {
- if (j == game.map_size[1]) {
- map_lines_split.push(line);
- line = [];
- j = 0;
+ if (game.turn_complete) {
+ let map_lines_split = [];
+ let line = [];
+ for (let i = 0, j = 0; i < game.map.length; i++, j++) {
+ if (j == game.map_size[1]) {
+ map_lines_split.push(line);
+ line = [];
+ j = 0;
+ };
+ if (this.map_mode == 'protections') {
+ line.push(game.map_control[i] + ' ');
+ } else {
+ line.push(game.map[i] + ' ');
+ }
};
- if (this.map_mode == 'protections') {
- line.push(game.map_control[i] + ' ');
- } else {
- line.push(game.map[i] + ' ');
- }
- };
- map_lines_split.push(line);
- if (this.map_mode == 'terrain + annotations') {
- for (const coordinate of explorer.info_hints) {
- map_lines_split[coordinate[0]][coordinate[1]] = 'A ';
+ map_lines_split.push(line);
+ if (this.map_mode == 'terrain + annotations') {
+ for (const coordinate of explorer.info_hints) {
+ map_lines_split[coordinate[0]][coordinate[1]] = 'A ';
+ }
+ } else if (this.map_mode == 'terrain + things') {
+ for (const p in game.portals) {
+ let coordinate = p.split(',')
+ 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) {
+ let t = game.things[thing_id];
+ let symbol = game.thing_types[t.type_];
+ let meta_char = ' ';
+ if (t.thing_char) {
+ meta_char = t.thing_char;
+ }
+ if (used_positions.includes(t.position.toString())) {
+ meta_char = '+';
+ };
+ map_lines_split[t.position[0]][t.position[1]] = symbol + meta_char;
+ used_positions.push(t.position.toString());
+ };
}
- } else if (this.map_mode == 'terrain + things') {
- for (const p in game.portals) {
- let coordinate = p.split(',')
- let original = map_lines_split[coordinate[0]][coordinate[1]];
- map_lines_split[coordinate[0]][coordinate[1]] = original[0] + 'P';
+ let player = game.things[game.player_id];
+ if (tui.mode.shows_info || tui.mode.name == 'control_tile_draw') {
+ map_lines_split[explorer.position[0]][explorer.position[1]] = '??';
+ } else if (tui.map_mode != 'terrain + things') {
+ map_lines_split[player.position[0]][player.position[1]] = '??';
}
- let used_positions = [];
- for (const thing_id in game.things) {
- let t = game.things[thing_id];
- let symbol = game.thing_types[t.type_];
- let meta_char = ' ';
- if (t.player_char) {
- meta_char = t.player_char;
- }
- if (used_positions.includes(t.position.toString())) {
- meta_char = '+';
+ this.map_lines = []
+ if (game.map_geometry == 'Square') {
+ for (let line_split of map_lines_split) {
+ this.map_lines.push(line_split.join(''));
};
- map_lines_split[t.position[0]][t.position[1]] = symbol + meta_char;
- used_positions.push(t.position.toString());
- };
- }
- let player = game.things[game.player_id];
- if (tui.mode.shows_info || tui.mode.name == 'control_tile_draw') {
- map_lines_split[explorer.position[0]][explorer.position[1]] = '??';
- } else if (tui.map_mode != 'terrain + things') {
- map_lines_split[player.position[0]][player.position[1]] = '??';
- }
- let map_lines = []
- if (game.map_geometry == 'Square') {
- for (let line_split of map_lines_split) {
- map_lines.push(line_split.join(''));
- };
- } else if (game.map_geometry == 'Hex') {
- let indent = 0
- for (let line_split of map_lines_split) {
- map_lines.push(' '.repeat(indent) + line_split.join(''));
- if (indent == 0) {
- indent = 1;
- } else {
- indent = 0;
+ } else if (game.map_geometry == 'Hex') {
+ let indent = 0
+ for (let line_split of map_lines_split) {
+ this.map_lines.push(' '.repeat(indent) + line_split.join(''));
+ if (indent == 0) {
+ indent = 1;
+ } else {
+ indent = 0;
+ };
};
+ }
+ let window_center = [terminal.rows / 2, this.window_width / 2];
+ let center_position = [player.position[0], player.position[1]];
+ if (tui.mode.shows_info || tui.mode.name == 'control_tile_draw') {
+ center_position = [explorer.position[0], explorer.position[1]];
+ }
+ center_position[1] = center_position[1] * 2;
+ this.offset = [center_position[0] - window_center[0],
+ center_position[1] - window_center[1]]
+ if (game.map_geometry == 'Hex' && this.offset[0] % 2) {
+ this.offset[1] += 1;
};
- }
- let window_center = [terminal.rows / 2, this.window_width / 2];
- let center_position = [player.position[0], player.position[1]];
- if (tui.mode.shows_info || tui.mode.name == 'control_tile_draw') {
- center_position = [explorer.position[0], explorer.position[1]];
- }
- center_position[1] = center_position[1] * 2;
- let offset = [center_position[0] - window_center[0],
- center_position[1] - window_center[1]]
- if (game.map_geometry == 'Hex' && offset[0] % 2) {
- offset[1] += 1;
};
- let term_y = Math.max(0, -offset[0]);
- let term_x = Math.max(0, -offset[1]);
- let map_y = Math.max(0, offset[0]);
- let map_x = Math.max(0, offset[1]);
+ let term_y = Math.max(0, -this.offset[0]);
+ let term_x = Math.max(0, -this.offset[1]);
+ let map_y = Math.max(0, this.offset[0]);
+ let map_x = Math.max(0, this.offset[1]);
for (; term_y < terminal.rows && map_y < game.map_size[0]; term_y++, map_y++) {
- let to_draw = map_lines[map_y].slice(map_x, this.window_width + offset[1]);
+ let to_draw = this.map_lines[map_y].slice(map_x, this.window_width + this.offset[1]);
terminal.write(term_y, term_x, to_draw);
}
},
@@ -948,7 +983,9 @@ let tui = {
terminal.write(0, this.window_width, 'MODE: ' + this.mode.short_desc + ' â ' + help);
},
draw_turn_line: function(n) {
- terminal.write(1, this.window_width, 'TURN: ' + game.turn);
+ if (game.turn_complete) {
+ terminal.write(1, this.window_width, 'TURN: ' + game.turn);
+ }
},
draw_history: function() {
let log_display_lines = [];
@@ -1066,10 +1103,8 @@ let tui = {
this.draw_history();
this.draw_input();
} else {
- if (game.turn_complete) {
- this.draw_map();
- this.draw_turn_line();
- }
+ this.draw_map();
+ this.draw_turn_line();
this.draw_mode_line();
if (this.mode.shows_info) {
this.draw_info();
@@ -1219,16 +1254,16 @@ let explorer = {
let symbol = game.thing_types[t.type_];
let protection = t.protection;
if (protection == '.') {
- protection = 'unprotected';
+ protection = 'none';
}
- info += "THING: " + t.type_ + " / protection: " + protection + " / " + symbol;
- if (t.player_char) {
- info += t.player_char;
+ info += "THING: " + t.type_ + " / " + symbol;
+ if (t.thing_char) {
+ info += t.thing_char;
};
if (t.name_) {
info += " (" + t.name_ + ")";
}
- info += "\n";
+ info += " / protection: " + protection + "\n";
}
}
if (this.position in game.portals) {
@@ -1379,6 +1414,10 @@ tui.inputEl.addEventListener('keydown', (event) => {
server.send(["TASK:PICK_UP"]);
} else if (event.key === tui.keys.drop_thing && tui.task_action_on('drop_thing')) {
server.send(["TASK:DROP"]);
+ } else if (event.key === tui.keys.consume && tui.task_action_on('consume')) {
+ server.send(["TASK:INTOXICATE"]);
+ } else if (event.key === tui.keys.door && tui.task_action_on('door')) {
+ server.send(["TASK:DOOR"]);
} else if (event.key in tui.movement_keys && tui.task_action_on('move')) {
server.send(['TASK:MOVE', tui.movement_keys[event.key]]);
} else if (event.key === tui.keys.teleport) {
@@ -1495,6 +1534,12 @@ document.getElementById("drop_thing").onclick = function() {
document.getElementById("flatten").onclick = function() {
server.send(['TASK:FLATTEN_SURROUNDINGS', tui.password]);
};
+document.getElementById("door").onclick = function() {
+ server.send(['TASK:DOOR']);
+};
+document.getElementById("consume").onclick = function() {
+ server.send(['TASK:INTOXICATE']);
+};
document.getElementById("teleport").onclick = function() {
game.teleport();
};