#!/usr/bin/env python3
import curses
-import plom_socket_io
+import plom_socket
import socket
import threading
from parser import ArgError, Parser
import game_common
-class MapSquare(game_common.Map):
-
- def list_terrain_to_lines(self, terrain_as_list, center, size):
- terrain = ''.join(terrain_as_list)
- map_lines = []
- start_cut = 0
- while start_cut < len(terrain):
- limit = start_cut + self.size[1]
- map_lines += [terrain[start_cut:limit]]
- start_cut = limit
- if len(map_lines) > size[0] and center[0] > size[0] / 2:
- diff = len(map_lines) - size[0]
- if center[0] > len(map_lines) - size[0] / 2:
- map_lines = map_lines[diff:]
+class Map(game_common.Map):
+
+ def y_cut(self, map_lines, center_y, view_height):
+ map_height = len(map_lines)
+ if map_height > view_height and center_y > view_height / 2:
+ if center_y > map_height - view_height / 2:
+ map_lines[:] = map_lines[map_height - view_height:]
else:
- start = center[0] - int(size[0] / 2)
- map_lines = map_lines[start:start + size[0]]
- if self.size[1] > size[1] and center[1] > size[1] / 2:
- if center[1] > self.size[1] - size[1] / 2:
- cut_start = self.size[1] - size[1]
+ start = center_y - int(view_height / 2) - 1
+ map_lines[:] = map_lines[start:start + view_height]
+
+ def x_cut(self, map_lines, center_x, view_width, map_width):
+ if map_width > view_width and center_x > view_width / 2:
+ if center_x > map_width - view_width / 2:
+ cut_start = map_width - view_width
cut_end = None
else:
- cut_start = center[1] - int(size[1] / 2)
- cut_end = cut_start + size[1]
- map_lines = [line[cut_start:cut_end] for line in map_lines]
+ cut_start = center_x - int(view_width / 2)
+ cut_end = cut_start + view_width
+ map_lines[:] = [line[cut_start:cut_end] for line in map_lines]
+
+
+class MapSquare(Map):
+
+ def format_to_view(self, map_string, center, size):
+
+ def map_string_to_lines(map_string):
+ map_lines = []
+ start_cut = 0
+ while start_cut < len(map_string):
+ limit = start_cut + self.size[1]
+ map_lines += [map_string[start_cut:limit]]
+ start_cut = limit
+ return map_lines
+
+ map_lines = map_string_to_lines(map_string)
+ self.y_cut(map_lines, center[0], size[0])
+ self.x_cut(map_lines, center[1], size[1], self.size[1])
return map_lines
-class MapHex(game_common.Map):
-
- def list_terrain_to_lines(self, terrain_as_list, center, size):
- new_terrain_list = [' ']
- x = 0
- y = 0
- for c in terrain_as_list:
- new_terrain_list += [c, ' ']
- x += 1
- if x == self.size[1]:
- new_terrain_list += ['\n']
- x = 0
- y += 1
- if y % 2 == 0:
- new_terrain_list += [' ']
- map_lines = ''.join(new_terrain_list).split('\n')
- if len(map_lines) > size[0] and center[0] > size[0] / 2:
- diff = len(map_lines) - size[0]
- if center[0] > len(map_lines) - size[0] / 2:
- map_lines = map_lines[diff:]
- else:
- start = center[0] - int(size[0] / 2)
- map_lines = map_lines[start:start + size[0]]
- if self.size[1]*2 > size[1] and center[1]*4 > size[1]:
- if center[1]*2 > self.size[1]*2 - size[1] / 2:
- cut_start = self.size[1] * 2 - size[1]
- cut_end = None
- else:
- cut_start = center[1]*2 - int(size[1] / 2)
- cut_end = cut_start + size[1]
- map_lines = [line[cut_start:cut_end] for line in map_lines]
+class MapHex(Map):
+
+ def format_to_view(self, map_string, center, size):
+
+ def map_string_to_lines(map_string):
+ map_view_chars = ['0']
+ x = 0
+ y = 0
+ for c in map_string:
+ map_view_chars += [c, ' ']
+ x += 1
+ if x == self.size[1]:
+ map_view_chars += ['\n']
+ x = 0
+ y += 1
+ if y % 2 == 0:
+ map_view_chars += ['0']
+ if y % 2 == 0:
+ map_view_chars = map_view_chars[:-1]
+ map_view_chars = map_view_chars[:-1]
+ return ''.join(map_view_chars).split('\n')
+
+ map_lines = map_string_to_lines(map_string)
+ self.y_cut(map_lines, center[0], size[0])
+ map_width = self.size[1] * 2 + 1
+ self.x_cut(map_lines, center[1] * 2, size[1], map_width)
return map_lines
-map_manager = game_common.MapManager(globals())
+map_manager = game_common.MapManager((MapHex, MapSquare))
class World(game_common.World):
self.world = World(self)
self.log_text = ''
self.to_update = {
- 'log': False,
- 'map': False,
- 'turn': False,
+ 'log': True,
+ 'map': True,
+ 'turn': True,
}
self.do_quit = False
+ def get_command_signature(self, command_name):
+ method_candidate = 'cmd_' + command_name
+ method = None
+ argtypes = ''
+ if hasattr(self, method_candidate):
+ method = getattr(self, method_candidate)
+ if hasattr(method, 'argtypes'):
+ argtypes = method.argtypes
+ return method, argtypes
+
+ def get_string_options(self, string_option_type):
+ if string_option_type == 'geometry':
+ return self.map_manager.get_map_geometries()
+ return None
+
def handle_input(self, msg):
if msg == 'BYE':
self.do_quit = True
return
try:
- command = self.parser.parse(msg)
+ command, args = self.parser.parse(msg)
if command is None:
self.log('UNHANDLED INPUT: ' + msg)
self.to_update['log'] = True
else:
- command()
+ command(*args)
except ArgError as e:
- self.log('ARGUMENT ERROR: ' + msg + '\n' + str(e))
- self.to_update['log'] = True
+ self.log('ARGUMENT ERROR: ' + msg + '\n' + str(e))
+ self.to_update['log'] = True
def log(self, msg):
"""Prefix msg plus newline to self.log_text."""
self.log_text = msg + '\n' + self.log_text
+ self.to_update['log'] = True
def symbol_for_type(self, type_):
symbol = '?'
def cmd_LAST_PLAYER_TASK_RESULT(self, msg):
if msg != "success":
self.log(msg)
- self.to_update['log'] = True
cmd_LAST_PLAYER_TASK_RESULT.argtypes = 'string'
def cmd_TURN_FINISHED(self, n):
pass
cmd_TURN_FINISHED.argtypes = 'int:nonneg'
- def cmd_NEW_TURN(self, n):
+ def cmd_TURN(self, n):
"""Set self.turn to n, empty self.things."""
self.world.turn = n
self.world.things = []
- cmd_NEW_TURN.argtypes = 'int:nonneg'
+ self.to_update['turn'] = False
+ self.to_update['map'] = False
+ cmd_TURN.argtypes = 'int:nonneg'
def cmd_VISIBLE_MAP_LINE(self, y, terrain_line):
self.world.map_.set_line(y, terrain_line)
'YZ[\\]^_\`abcdefghijklmnopqrstuvwxyz{|}~'
-def recv_loop(socket, game):
- for msg in plom_socket_io.recv(s):
+def recv_loop(plom_socket, game):
+ for msg in plom_socket.recv():
game.handle_input(msg)
class MapWidget(Widget):
def draw(self):
- to_join = []
- if len(self.tui.game.world.map_.terrain) > 0:
+
+ def terrain_with_objects():
terrain_as_list = list(self.tui.game.world.map_.terrain[:])
for t in self.tui.game.world.things:
pos_i = self.tui.game.world.map_.get_position_index(t.position)
terrain_as_list[pos_i] = self.tui.game.symbol_for_type(t.type_)
- center = self.tui.game.world.player_position
- lines = self.tui.game.world.map_.list_terrain_to_lines(terrain_as_list, center, self.size)
+ return ''.join(terrain_as_list)
+
+ def pad_or_cut_x(lines):
line_width = self.size[1]
- for line in lines:
+ for y in range(len(lines)):
+ line = lines[y]
if line_width > len(line):
to_pad = line_width - (len(line) % line_width)
- to_join += [line + '0' * to_pad]
+ lines[y] = line + '0' * to_pad
else:
- to_join += [line[:line_width]]
- if len(to_join) < self.size[0]:
- to_pad = self.size[0] - len(to_join)
- to_join += to_pad * ['0' * self.size[1]]
- text = ''.join(to_join)
- text_as_list = []
- for c in text:
- if c in {'@', 'm'}:
- text_as_list += [(c, curses.color_pair(1))]
- elif c == '.':
- text_as_list += [(c, curses.color_pair(2))]
- elif c in {'x', 'X', '#'}:
- text_as_list += [(c, curses.color_pair(3))]
- else:
- text_as_list += [c]
- self.safe_write(text_as_list)
+ lines[y] = line[:line_width]
+
+ def pad_y(lines):
+ if len(lines) < self.size[0]:
+ to_pad = self.size[0] - len(lines)
+ lines += to_pad * ['0' * self.size[1]]
+
+ def lines_to_colored_chars(lines):
+ chars_with_attrs = []
+ for c in ''.join(lines):
+ if c in {'@', 'm'}:
+ chars_with_attrs += [(c, curses.color_pair(1))]
+ elif c == '.':
+ chars_with_attrs += [(c, curses.color_pair(2))]
+ elif c in {'x', 'X', '#'}:
+ chars_with_attrs += [(c, curses.color_pair(3))]
+ else:
+ chars_with_attrs += [c]
+ return chars_with_attrs
+
+ if self.tui.game.world.map_.terrain == '':
+ lines = []
+ pad_y(lines)
+ self.safe_write(''.join(lines))
+ return
+
+ terrain_with_objects = terrain_with_objects()
+ center = self.tui.game.world.player_position
+ lines = self.tui.game.world.map_.format_to_view(terrain_with_objects,
+ center, self.size)
+ pad_or_cut_x(lines)
+ pad_y(lines)
+ self.safe_write(lines_to_colored_chars(lines))
class TurnWidget(Widget):
class TUI:
- def __init__(self, socket, game):
- self.socket = socket
+ def __init__(self, plom_socket, game):
+ self.socket = plom_socket
self.game = game
self.parser = Parser(self.game)
self.to_update = {'edit': False}
self.log = LogWidget(self, (4, 0), (None, 20), ['log'])
self.map_ = MapWidget(self, (0, 21), (None, None), ['map'])
widgets = (self.edit, self.turn, self.log, self.map_)
+ map_mode = False
while True:
for w in widgets:
w.ensure_freshness()
self.to_update[key] = False
try:
key = self.stdscr.getkey()
- if len(key) == 1 and key in ASCII_printable and \
- len(self.to_send) < len(self.edit):
- self.to_send += [key]
- self.to_update['edit'] = True
- elif key == 'KEY_BACKSPACE':
- self.to_send[:] = self.to_send[:-1]
- self.to_update['edit'] = True
- elif key == '\n':
- plom_socket_io.send(self.socket, ''.join(self.to_send))
- self.to_send[:] = []
- self.to_update['edit'] = True
- elif key == 'KEY_RESIZE':
+ if key == 'KEY_RESIZE':
curses.endwin()
self.setup_screen(curses.initscr())
for w in widgets:
w.size = w.size_def
w.ensure_freshness(True)
+ elif key == '\t': # Tabulator key.
+ map_mode = False if map_mode else True
+ elif map_mode:
+ if type(self.game.world.map_) == MapSquare:
+ if key == 'a':
+ self.socket.send('TASK:MOVE LEFT')
+ elif key == 'd':
+ self.socket.send('TASK:MOVE RIGHT')
+ elif key == 'w':
+ self.socket.send('TASK:MOVE UP')
+ elif key == 's':
+ self.socket.send('TASK:MOVE DOWN')
+ elif type(self.game.world.map_) == MapHex:
+ if key == 'w':
+ self.socket.send('TASK:MOVE UPLEFT')
+ elif key == 'e':
+ self.socket.send('TASK:MOVE UPRIGHT')
+ if key == 's':
+ self.socket.send('TASK:MOVE LEFT')
+ elif key == 'd':
+ self.socket.send('TASK:MOVE RIGHT')
+ if key == 'x':
+ self.socket.send('TASK:MOVE DOWNLEFT')
+ elif key == 'c':
+ self.socket.send('TASK:MOVE DOWNRIGHT')
+ else:
+ if len(key) == 1 and key in ASCII_printable and \
+ len(self.to_send) < len(self.edit):
+ self.to_send += [key]
+ self.to_update['edit'] = True
+ elif key == 'KEY_BACKSPACE':
+ self.to_send[:] = self.to_send[:-1]
+ self.to_update['edit'] = True
+ elif key == '\n': # Return key
+ self.socket.send(''.join(self.to_send))
+ self.to_send[:] = []
+ self.to_update['edit'] = True
except curses.error:
pass
if self.game.do_quit:
s = socket.create_connection(('127.0.0.1', 5000))
+plom_socket = plom_socket.PlomSocket(s)
game = Game()
-t = threading.Thread(target=recv_loop, args=(s, game))
+t = threading.Thread(target=recv_loop, args=(plom_socket, game))
t.start()
-TUI(s, game)
+TUI(plom_socket, game)
projects / plomrogue2-experiments / blobdiff