X-Git-Url: https://plomlompom.com/repos/%7B%7Bdb.prefix%7D%7D/calendar?a=blobdiff_plain;ds=inline;f=rogue_chat.html;h=82bfbed97fd8902e48aca9e86bb8ec3e15c109eb;hb=2dc444966037a42b51ed190ab0eab88a09c0282a;hp=f08105023e30b3d062b58e06fb9f52551647cee9;hpb=cbfca994af863c569442f2199dcec1e2b2aa42d6;p=plomrogue2
diff --git a/rogue_chat.html b/rogue_chat.html
index f081050..82bfbed 100644
--- a/rogue_chat.html
+++ b/rogue_chat.html
@@ -54,6 +54,7 @@ terminal rows:
+
@@ -101,6 +102,7 @@ terminal rows:
flatten surroundings:
teleport:
spin:
+dance:
open/close:
consume:
install:
@@ -262,6 +264,7 @@ let key_descriptions = {
'install': '(un-)install',
'wear': '(un-)wear',
'spin': 'spin',
+ 'dance': 'dance',
'toggle_map_mode': 'toggle map view',
'toggle_tile_draw': 'toggle protection character drawing',
'hex_move_upleft': 'up-left',
@@ -491,7 +494,7 @@ let server = {
game.things_new = [];
} else if (tokens[0] === 'STATS') {
game.bladder_pressure_new = parseInt(tokens[1])
- game.weariness_new = parseInt(tokens[2])
+ game.energy_new = parseInt(tokens[2])
} else if (tokens[0] === 'THING') {
let t = game.get_thing_temp(tokens[4], true);
t.position = parser.parse_yx(tokens[1]);
@@ -549,7 +552,7 @@ let server = {
game.player = game.things[game.player_id];
game.players_hat_chars = game.players_hat_chars_new;
game.bladder_pressure = game.bladder_pressure_new
- game.weariness = game.weariness_new
+ game.energy = game.energy_new
game.turn_complete = true;
if (tui.mode.name == 'post_login_wait') {
tui.switch_mode('play');
@@ -724,6 +727,7 @@ let tui = {
'command': 'COMMAND',
'consume': 'INTOXICATE',
'spin': 'SPIN',
+ 'dance': 'DANCE',
},
offset: [0,0],
map_lines: [],
@@ -735,13 +739,13 @@ let tui = {
this.mode_play.available_modes = ["chat", "study", "edit", "admin_enter",
"command_thing", "take_thing", "drop_thing"]
this.mode_play.available_actions = ["move", "teleport", "door", "consume",
- "wear", "spin"];
+ "wear", "spin", "dance"];
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",
"control_tile_type", "chat",
"study", "play", "edit"]
- this.mode_admin.available_actions = ["move"];
+ this.mode_admin.available_actions = ["move", "toggle_map_mode"];
this.mode_control_tile_draw.available_modes = ["admin_enter"]
this.mode_control_tile_draw.available_actions = ["toggle_tile_draw"];
this.mode_edit.available_modes = ["write", "annotate", "portal", "name_thing",
@@ -809,7 +813,7 @@ let tui = {
|| !game.player.carrying.commandable)) {
return fail('not carrying anything commandable');
} else if (mode_name == 'name_thing' && !game.player.carrying) {
- return fail('not carrying anything to re-name');
+ return fail('not carrying anything to re-name', 'edit');
} else if (mode_name == 'admin_thing_protect' && !game.player.carrying) {
return fail('not carrying anything to protect')
} else if (mode_name == 'take_thing' && game.player.carrying) {
@@ -1065,9 +1069,13 @@ let tui = {
this.switch_mode('play');
},
enter_ascii_art: function(command) {
- if (this.inputEl.value.length != 6) {
- this.log_msg('? wrong input length, must be 6; try again');
+ if (this.inputEl.value.length > 6) {
+ this.log_msg('? wrong input length, must be max 6; try again');
return;
+ } else if (this.inputEl.value.length < 6) {
+ while (this.inputEl.value.length < 6) {
+ this.inputEl.value += ' ';
+ }
}
this.log_msg(' ' + this.inputEl.value);
this.full_ascii_draw += this.inputEl.value;
@@ -1219,7 +1227,7 @@ let tui = {
},
draw_stats_line: function(n) {
terminal.write(1, this.window_width,
- 'WEARINESS: ' + game.weariness +
+ 'ENERGY: ' + game.energy +
' BLADDER: ' + game.bladder_pressure);
},
draw_history: function() {
@@ -1686,6 +1694,8 @@ tui.inputEl.addEventListener('keydown', (event) => {
server.send(["TASK:WEAR"]);
} else if (event.key === tui.keys.spin && tui.task_action_on('spin')) {
server.send(["TASK:SPIN"]);
+ } else if (event.key === tui.keys.dance && tui.task_action_on('dance')) {
+ server.send(["TASK:DANCE"]);
} 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) {
@@ -1710,6 +1720,8 @@ tui.inputEl.addEventListener('keydown', (event) => {
} else if (tui.mode.name == 'admin') {
if (tui.mode.mode_switch_on_key(event)) {
null;
+ } else if (event.key == tui.keys.toggle_map_mode) {
+ tui.toggle_map_mode();
} else if (event.key in tui.movement_keys && tui.task_action_on('move')) {
server.send(['TASK:MOVE', tui.movement_keys[event.key]]);
};
@@ -1762,7 +1774,10 @@ window.setInterval(function() {
}, 1000);
window.setInterval(function() {
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);
};
}, 100);
document.getElementById("help").onclick = function() {
@@ -1801,6 +1816,9 @@ document.getElementById("wear").onclick = function() {
document.getElementById("spin").onclick = function() {
server.send(['TASK:SPIN']);
};
+document.getElementById("dance").onclick = function() {
+ server.send(['TASK:DANCE']);
+};
document.getElementById("teleport").onclick = function() {
game.teleport();
};