home
·
contact
·
privacy
projects
/
plomrogue2
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
On name thing prohibition, switch back to edit mode; disappear help in curses client...
[plomrogue2]
/
rogue_chat.html
diff --git
a/rogue_chat.html
b/rogue_chat.html
index fe78f6b7118571666775d0f15df731ec3b710193..51e8078611bf510f5c4656f7724f3dfecaf643a0 100644
(file)
--- a/
rogue_chat.html
+++ b/
rogue_chat.html
@@
-764,10
+764,10
@@
let tui = {
},
switch_mode: function(mode_name) {
},
switch_mode: function(mode_name) {
- function fail(msg) {
+ function fail(msg
, return_mode
) {
tui.log_msg('? ' + msg);
terminal.blink_screen();
tui.log_msg('? ' + msg);
terminal.blink_screen();
- this.switch_mode(
'play'
);
+ this.switch_mode(
return_mode
);
}
if (this.mode && this.mode.name == 'control_tile_draw') {
}
if (this.mode && this.mode.name == 'control_tile_draw') {
@@
-776,13
+776,13
@@
let tui = {
this.tile_draw = false;
if (mode_name == 'command_thing' && (!game.player.carrying
|| !game.player.carrying.commandable)) {
this.tile_draw = false;
if (mode_name == 'command_thing' && (!game.player.carrying
|| !game.player.carrying.commandable)) {
- return fail('not carrying anything commandable');
+ return fail('not carrying anything commandable'
, 'play'
);
};
if (mode_name == 'take_thing' && game.player.carrying) {
};
if (mode_name == 'take_thing' && game.player.carrying) {
- return fail('already carrying something');
+ return fail('already carrying something'
, 'play'
);
};
if (mode_name == 'drop_thing' && !game.player.carrying) {
};
if (mode_name == 'drop_thing' && !game.player.carrying) {
- return fail('not carrying anything droppable');
+ return fail('not carrying anything droppable'
, 'play'
);
}
if (mode_name == 'admin_enter' && this.is_admin) {
mode_name = 'admin';
}
if (mode_name == 'admin_enter' && this.is_admin) {
mode_name = 'admin';
@@
-800,7
+800,7
@@
let tui = {
}
}
if (!thing_id) {
}
}
if (!thing_id) {
- return fail('not standing over thing');
+ return fail('not standing over thing'
, 'fail'
);
} else {
this.selected_thing_id = thing_id;
}
} else {
this.selected_thing_id = thing_id;
}