X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=rogue_chat_curses.py;h=fdfc2bcbfb12096dd8b36148f48b2b63454242d8;hb=075ed2b9529e52ab8a5075d56d77e09d2191d9c7;hp=aeb955e60f9593d113f37fb6f0f33c4f9b2817d6;hpb=dbb17811ffb485471c228544549e8c8ff940a946;p=plomrogue2
diff --git a/rogue_chat_curses.py b/rogue_chat_curses.py
index aeb955e..fdfc2bc 100755
--- a/rogue_chat_curses.py
+++ b/rogue_chat_curses.py
@@ -41,6 +41,11 @@ mode_helps = {
'intro': 'Pick up a thing in reach by entering its index number. Enter nothing to abort.',
'long': 'You see a list of things which you could pick up. Enter the target thing\'s index, or, to leave, nothing.'
},
+ 'drop_thing': {
+ 'short': 'drop thing',
+ 'intro': 'Enter number of direction to which you want to drop thing.',
+ 'long': 'Drop currently carried thing by entering the target direction index. Enter nothing to return to play mode..'
+ },
'admin_thing_protect': {
'short': 'change thing protection',
'intro': '@ enter thing protection character:',
@@ -195,11 +200,16 @@ def cmd_CHAT(game, msg):
game.tui.do_refresh = True
cmd_CHAT.argtypes = 'string'
+def cmd_CHATFACE(game, thing_id):
+ game.tui.draw_face = thing_id
+ game.tui.do_refresh = True
+cmd_CHATFACE.argtypes = 'int:pos'
+
def cmd_PLAYER_ID(game, player_id):
game.player_id = player_id
cmd_PLAYER_ID.argtypes = 'int:nonneg'
-def cmd_THING(game, yx, thing_type, protection, thing_id, portable):
+def cmd_THING(game, yx, thing_type, protection, thing_id, portable, commandable):
t = game.get_thing(thing_id)
if not t:
t = ThingBase(game, thing_id)
@@ -208,7 +218,8 @@ def cmd_THING(game, yx, thing_type, protection, thing_id, portable):
t.type_ = thing_type
t.protection = protection
t.portable = portable
-cmd_THING.argtypes = 'yx_tuple:nonneg string:thing_type char int:nonneg bool'
+ t.commandable = commandable
+cmd_THING.argtypes = 'yx_tuple:nonneg string:thing_type char int:nonneg bool bool'
def cmd_THING_NAME(game, thing_id, name):
t = game.get_thing(thing_id)
@@ -261,11 +272,12 @@ def cmd_MAP_CONTROL(game, content):
cmd_MAP_CONTROL.argtypes = 'string'
def cmd_GAME_STATE_COMPLETE(game):
- if game.tui.mode.name == 'post_login_wait':
- game.tui.switch_mode('play')
game.turn_complete = True
game.tui.do_refresh = True
game.tui.info_cached = None
+ game.player = game.get_thing(game.player_id)
+ if game.tui.mode.name == 'post_login_wait':
+ game.tui.switch_mode('play')
cmd_GAME_STATE_COMPLETE.argtypes = ''
def cmd_PORTAL(game, position, msg):
@@ -299,6 +311,7 @@ def cmd_TASKS(game, tasks_comma_separated):
game.tui.mode_write.legal = 'WRITE' in game.tasks
game.tui.mode_command_thing.legal = 'COMMAND' in game.tasks
game.tui.mode_take_thing.legal = 'PICK_UP' in game.tasks
+ game.tui.mode_drop_thing.legal = 'DROP' in game.tasks
cmd_TASKS.argtypes = 'string'
def cmd_THING_TYPE(game, thing_type, symbol_hint):
@@ -309,9 +322,9 @@ def cmd_THING_INSTALLED(game, thing_id):
game.get_thing(thing_id).installed = True
cmd_THING_INSTALLED.argtypes = 'int:pos'
-def cmd_THING_CARRYING(game, thing_id):
- game.get_thing(thing_id).carrying = True
-cmd_THING_CARRYING.argtypes = 'int:pos'
+def cmd_THING_CARRYING(game, thing_id, carried_id):
+ game.get_thing(thing_id).carrying = game.get_thing(carried_id)
+cmd_THING_CARRYING.argtypes = 'int:pos int:pos'
def cmd_TERRAIN(game, terrain_char, terrain_desc):
game.terrains[terrain_char] = terrain_desc
@@ -340,6 +353,7 @@ class Game(GameBase):
self.register_command(cmd_ADMIN_OK)
self.register_command(cmd_PONG)
self.register_command(cmd_CHAT)
+ self.register_command(cmd_CHATFACE)
self.register_command(cmd_REPLY)
self.register_command(cmd_PLAYER_ID)
self.register_command(cmd_TURN)
@@ -369,6 +383,7 @@ class Game(GameBase):
self.annotations = {}
self.portals = {}
self.terrains = {}
+ self.player = None
def get_string_options(self, string_option_type):
if string_option_type == 'map_geometry':
@@ -444,6 +459,7 @@ class TUI:
mode_name_thing = Mode('name_thing', has_input_prompt=True, shows_info=True)
mode_command_thing = Mode('command_thing', has_input_prompt=True)
mode_take_thing = Mode('take_thing', has_input_prompt=True)
+ mode_drop_thing = Mode('drop_thing', has_input_prompt=True)
mode_enter_face = Mode('enter_face', has_input_prompt=True)
is_admin = False
tile_draw = False
@@ -452,10 +468,10 @@ class TUI:
import os
import json
self.mode_play.available_modes = ["chat", "study", "edit", "admin_enter",
- "command_thing", "take_thing"]
- self.mode_play.available_actions = ["move", "drop_thing",
- "teleport", "door", "consume",
- "install", "wear"]
+ "command_thing", "take_thing",
+ "drop_thing"]
+ self.mode_play.available_actions = ["move", "teleport", "door", "consume",
+ "install", "wear", "spin"]
self.mode_study.available_modes = ["chat", "play", "admin_enter", "edit"]
self.mode_study.available_actions = ["toggle_map_mode", "move_explorer"]
self.mode_admin.available_modes = ["admin_thing_protect", "control_pw_type",
@@ -465,10 +481,11 @@ class TUI:
self.mode_control_tile_draw.available_modes = ["admin_enter"]
self.mode_control_tile_draw.available_actions = ["move_explorer",
"toggle_tile_draw"]
- self.mode_edit.available_modes = ["write", "annotate", "portal", "name_thing",
- "password", "chat", "study", "play",
- "admin_enter", "enter_face"]
- self.mode_edit.available_actions = ["move", "flatten", "toggle_map_mode"]
+ self.mode_edit.available_modes = ["write", "annotate", "portal",
+ "name_thing", "enter_face", "password",
+ "chat", "study", "play", "admin_enter"]
+ self.mode_edit.available_actions = ["move", "flatten", "install",
+ "toggle_map_mode"]
self.mode = None
self.host = host
self.game = Game()
@@ -499,12 +516,13 @@ class TUI:
'flatten': 'F',
'switch_to_enter_face': 'f',
'switch_to_take_thing': 'z',
- 'drop_thing': 'u',
+ 'switch_to_drop_thing': 'u',
'teleport': 'p',
'consume': 'C',
'door': 'D',
'install': 'I',
'wear': 'W',
+ 'spin': 'S',
'help': 'h',
'toggle_map_mode': 'L',
'toggle_tile_draw': 'm',
@@ -617,22 +635,35 @@ class TUI:
self.map_mode = 'terrain only'
def switch_mode(self, mode_name):
+
+ def fail(msg, return_mode='play'):
+ self.log_msg('? ' + msg)
+ self.flash = True
+ self.switch_mode(return_mode)
+
if self.mode and self.mode.name == 'control_tile_draw':
self.log_msg('@ finished tile protection drawing.')
+ self.draw_face = False
self.tile_draw = False
+ if mode_name == 'command_thing' and\
+ (not self.game.player.carrying or
+ not self.game.player.carrying.commandable):
+ return fail('not carrying anything commandable')
+ if mode_name == 'take_thing' and self.game.player.carrying:
+ return fail('already carrying something')
+ if mode_name == 'drop_thing' and not self.game.player.carrying:
+ return fail('not carrying anything droppable')
if mode_name == 'admin_enter' and self.is_admin:
mode_name = 'admin'
elif mode_name in {'name_thing', 'admin_thing_protect'}:
- player = self.game.get_thing(self.game.player_id)
thing = None
- for t in [t for t in self.game.things if t.position == player.position
- and t.id_ != player.id_]:
+ for t in [t for t in self.game.things
+ if t.position == self.game.player.position
+ and t.id_ != self.game.player.id_]:
thing = t
break
if not thing:
- self.flash = True
- self.log_msg('? not standing over thing')
- return
+ return fail('not standing over thing', 'edit')
else:
self.thing_selected = thing
self.mode = getattr(self, 'mode_' + mode_name)
@@ -642,8 +673,8 @@ class TUI:
elif self.mode.name != 'edit':
self.map_mode = 'terrain + things'
if self.mode.shows_info or self.mode.name == 'control_tile_draw':
- player = self.game.get_thing(self.game.player_id)
- self.explorer = YX(player.position.y, player.position.x)
+ self.explorer = YX(self.game.player.position.y,
+ self.game.player.position.x)
if self.mode.is_single_char_entry:
self.show_help = True
if len(self.mode.intro_msg) > 0:
@@ -655,30 +686,32 @@ class TUI:
self.log_msg('@ enter username')
elif self.mode.name == 'take_thing':
self.log_msg('Portable things in reach for pick-up:')
- player = self.game.get_thing(self.game.player_id)
- select_range = [player.position,
- player.position + YX(0,-1),
- player.position + YX(0, 1),
- player.position + YX(-1, 0),
- player.position + YX(1, 0)]
+ select_range = [self.game.player.position,
+ self.game.player.position + YX(0,-1),
+ self.game.player.position + YX(0, 1),
+ self.game.player.position + YX(-1, 0),
+ self.game.player.position + YX(1, 0)]
if type(self.game.map_geometry) == MapGeometryHex:
- if player.position.y % 2:
- select_range += [player.position + YX(-1, 1),
- player.position + YX(1, 1)]
+ if self.game.player.position.y % 2:
+ select_range += [self.game.player.position + YX(-1, 1),
+ self.game.player.position + YX(1, 1)]
else:
- select_range += [player.position + YX(-1, -1),
- player.position + YX(1, -1)]
- self.selectables = [t for t in self.game.things
+ select_range += [self.game.player.position + YX(-1, -1),
+ self.game.player.position + YX(1, -1)]
+ self.selectables = [t.id_ for t in self.game.things
if t.portable and t.position in select_range]
if len(self.selectables) == 0:
- self.log_msg('none')
- self.flash = True
- self.switch_mode('play')
- return
+ return fail('nothing to pick-up')
else:
for i in range(len(self.selectables)):
- t = self.selectables[i]
+ t = self.game.get_thing(self.selectables[i])
self.log_msg(str(i) + ': ' + self.get_thing_info(t))
+ elif self.mode.name == 'drop_thing':
+ self.log_msg('Direction to drop thing to:')
+ self.selectables =\
+ ['HERE'] + list(self.game.tui.movement_keys.values())
+ for i in range(len(self.selectables)):
+ self.log_msg(str(i) + ': ' + self.selectables[i])
elif self.mode.name == 'command_thing':
self.send('TASK:COMMAND ' + quote('HELP'))
elif self.mode.name == 'control_pw_pw':
@@ -898,11 +931,11 @@ class TUI:
draw_thing(t, used_positions)
for t in [t for t in self.game.things if t.type_ == 'Player']:
draw_thing(t, used_positions)
- player = self.game.get_thing(self.game.player_id)
if self.mode.shows_info or self.mode.name == 'control_tile_draw':
map_lines_split[self.explorer.y][self.explorer.x] = '??'
elif self.map_mode != 'terrain + things':
- map_lines_split[player.position.y][player.position.x] = '??'
+ map_lines_split[self.game.player.position.y]\
+ [self.game.player.position.x] = '??'
self.map_lines = []
if type(self.game.map_geometry) == MapGeometryHex:
indent = 0
@@ -914,7 +947,7 @@ class TUI:
self.map_lines += [''.join(line)]
window_center = YX(int(self.size.y / 2),
int(self.window_width / 2))
- center = player.position
+ center = self.game.player.position
if self.mode.shows_info or self.mode.name == 'control_tile_draw':
center = self.explorer
center = YX(center.y, center.x * 2)
@@ -931,6 +964,26 @@ class TUI:
term_y += 1
map_y += 1
+ def draw_face_popup():
+ t = self.game.get_thing(self.draw_face)
+ if not t or not hasattr(t, 'face'):
+ self.draw_face = False
+ return
+
+ start_x = self.window_width - 10
+ def draw_body_part(body_part, end_y):
+ safe_addstr(end_y - 4, start_x, ' ________ ')
+ safe_addstr(end_y - 3, start_x, '| |')
+ safe_addstr(end_y - 2, start_x, '| ' + body_part[0:6] + ' |')
+ safe_addstr(end_y - 1, start_x, '| ' + body_part[6:12] + ' |')
+ safe_addstr(end_y, start_x, '| ' + body_part[12:18] + ' |')
+
+ if hasattr(t, 'face'):
+ draw_body_part(t.face, self.size.y - 2)
+ if hasattr(t, 'hat'):
+ draw_body_part(t.hat, self.size.y - 5)
+ safe_addstr(self.size.y - 1, start_x, '| |')
+
def draw_help():
content = "%s help\n\n%s\n\n" % (self.mode.short_desc,
self.mode.help_intro)
@@ -979,6 +1032,20 @@ class TUI:
draw_map()
if self.show_help:
draw_help()
+ if self.draw_face and self.mode.name in {'chat', 'play'}:
+ draw_face_popup()
+
+ def pick_selectable(task_name):
+ try:
+ i = int(self.input_)
+ if i < 0 or i >= len(self.selectables):
+ self.log_msg('? invalid index, aborted')
+ else:
+ self.send('TASK:%s %s' % (task_name, self.selectables[i]))
+ except ValueError:
+ self.log_msg('? invalid index, aborted')
+ self.input_ = ''
+ self.switch_mode('play')
action_descriptions = {
'move': 'move',
@@ -992,6 +1059,7 @@ class TUI:
'wear': '(un-)wear',
'door': 'open/close',
'consume': 'consume',
+ 'spin': 'spin',
}
action_tasks = {
@@ -1004,6 +1072,7 @@ class TUI:
'move': 'MOVE',
'command': 'COMMAND',
'consume': 'INTOXICATE',
+ 'spin': 'SPIN',
}
curses.curs_set(False) # hide cursor
@@ -1045,15 +1114,22 @@ class TUI:
self.do_refresh = True
except curses.error:
continue
+ keycode = None
+ if len(key) == 1:
+ keycode = ord(key)
self.show_help = False
+ self.draw_face = False
if key == 'KEY_RESIZE':
reset_screen_size()
elif self.mode.has_input_prompt and key == 'KEY_BACKSPACE':
self.input_ = self.input_[:-1]
- elif self.mode.has_input_prompt and key == '\n' and self.input_ == ''\
- and self.mode.name in {'chat', 'command_thing', 'take_thing',
- 'admin_enter'}:
- if self.mode.name != 'chat':
+ elif (((not self.mode.is_intro) and keycode == 27) # Escape
+ or (self.mode.has_input_prompt and key == '\n'
+ and self.input_ == ''\
+ and self.mode.name in {'chat', 'command_thing',
+ 'take_thing', 'drop_thing',
+ 'admin_enter'})):
+ if self.mode.name not in {'chat', 'play', 'study', 'edit'}:
self.log_msg('@ aborted')
self.switch_mode('play')
elif self.mode.has_input_prompt and key == '\n' and self.input_ == '/help':
@@ -1079,20 +1155,12 @@ class TUI:
self.input_ = ""
self.switch_mode('edit')
elif self.mode.name == 'take_thing' and key == '\n':
- try:
- i = int(self.input_)
- if i < 0 or i >= len(self.selectables):
- self.log_msg('? invalid index, aborted')
- else:
- self.send('TASK:PICK_UP %s' % self.selectables[i].id_)
- except ValueError:
- self.log_msg('? invalid index, aborted')
- self.input_ = ''
- self.switch_mode('play')
+ pick_selectable('PICK_UP')
+ elif self.mode.name == 'drop_thing' and key == '\n':
+ pick_selectable('DROP')
elif self.mode.name == 'command_thing' and key == '\n':
- if task_action_on('command'):
- self.send('TASK:COMMAND ' + quote(self.input_))
- self.input_ = ""
+ self.send('TASK:COMMAND ' + quote(self.input_))
+ self.input_ = ""
elif self.mode.name == 'control_pw_pw' and key == '\n':
if self.input_ == '':
self.log_msg('@ aborted')
@@ -1174,20 +1242,17 @@ class TUI:
elif self.mode.name == 'play':
if self.mode.mode_switch_on_key(self, key):
continue
- elif key == self.keys['drop_thing'] and task_action_on('drop_thing'):
- self.send('TASK:DROP')
elif key == self.keys['door'] and task_action_on('door'):
self.send('TASK:DOOR')
elif key == self.keys['consume'] and task_action_on('consume'):
self.send('TASK:INTOXICATE')
- elif key == self.keys['install'] and task_action_on('install'):
- self.send('TASK:INSTALL')
elif key == self.keys['wear'] and task_action_on('wear'):
self.send('TASK:WEAR')
+ elif key == self.keys['spin'] and task_action_on('spin'):
+ self.send('TASK:SPIN')
elif key == self.keys['teleport']:
- player = self.game.get_thing(self.game.player_id)
- if player.position in self.game.portals:
- self.host = self.game.portals[player.position]
+ if self.game.player.position in self.game.portals:
+ self.host = self.game.portals[self.game.player.position]
self.reconnect()
else:
self.flash = True
@@ -1214,6 +1279,8 @@ class TUI:
continue
elif key == self.keys['flatten'] and task_action_on('flatten'):
self.send('TASK:FLATTEN_SURROUNDINGS ' + quote(self.password))
+ elif key == self.keys['install'] and task_action_on('install'):
+ self.send('TASK:INSTALL %s' % quote(self.password))
elif key == self.keys['toggle_map_mode']:
self.toggle_map_mode()
elif key in self.movement_keys and task_action_on('move'):