from plomrogue.parser import ArgError, Parser
from plomrogue.commands import cmd_PLAYER_ID, cmd_THING_HEALTH
from plomrogue.game import Game, WorldBase
-from plomrogue.mapping import MapHex
+from plomrogue.mapping import Map, MapGeometryHex, YX
from plomrogue.io import PlomSocket
from plomrogue.things import ThingBase
import types
import queue
-class ClientMap(MapHex):
+class ClientMap(Map):
def y_cut(self, map_lines, center_y, view_height):
map_height = len(map_lines)
cut_end = cut_start + view_width
map_lines[:] = [line[cut_start:cut_end] for line in map_lines]
- def format_to_view(self, map_cells, center, size):
+ def format_to_view(self, map_cells, center, size, indent_first_line):
def map_cells_to_lines(map_cells):
- map_view_chars = ['0']
+ map_view_chars = []
+ if indent_first_line:
+ map_view_chars += ['0']
x = 0
y = 0
for cell in map_cells:
else:
map_view_chars += [cell[0], cell[1]]
x += 1
- if x == self.size[1]:
+ if x == self.size.x:
map_view_chars += ['\n']
x = 0
y += 1
- if y % 2 == 0:
+ if y % 2 == int(not indent_first_line):
map_view_chars += ['0']
- if y % 2 == 0:
+ if y % 2 == int(not indent_first_line):
map_view_chars = map_view_chars[:-1]
map_view_chars = map_view_chars[:-1]
return ''.join(map_view_chars).split('\n')
map_lines = map_cells_to_lines(map_cells)
- if len(map_lines) % 2 == 0:
- map_lines = map_lines[1:]
- else:
- for i in range(len(map_lines)):
- map_lines[i] = '0' + map_lines[i]
- 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)
+ self.y_cut(map_lines, center[1].y, size.y)
+ map_width = self.size.x * 2 + 1
+ self.x_cut(map_lines, center[1].x * 2, size.x, map_width)
return map_lines
"""
super().__init__(*args, **kwargs)
self.map_ = ClientMap()
- self.offset = (0,0)
+ self.offset = YX(0,0)
self.player_inventory = []
self.player_id = 0
self.pickable_items = []
def cmd_THING_POS(game, i, yx):
t = game.world.get_thing(i)
- t.position = yx
+ t.position = YX(0,0), yx
cmd_THING_POS.argtypes = 'int:nonneg yx_tuple:nonneg'
def __init__(self):
self.parser = Parser(self)
self.world = World(self)
+ self.map_geometry = MapGeometryHex()
self.thing_type = ThingBase
self.commands = {'LAST_PLAYER_TASK_RESULT': cmd_LAST_PLAYER_TASK_RESULT,
'TURN_FINISHED': cmd_TURN_FINISHED,
def log(self, msg):
"""Prefix msg plus newline to self.log_text."""
self.log_text = msg + '\n' + self.log_text
- with open('log', 'w') as f:
- f.write(self.log_text)
self.tui.to_update['log'] = True
def symbol_for_type(self, type_):
self.check_updates = check_updates
self.tui = tui
self.start = start
- self.win = curses.newwin(1, 1, self.start[0], self.start[1])
+ self.win = curses.newwin(1, 1, self.start.y, self.start.x)
self.size_def = size # store for re-calling .size on SIGWINCH
self.size = size
self.do_update = True
@property
def size(self):
- return self.win.getmaxyx()
+ return YX(*self.win.getmaxyx())
@size.setter
def size(self, size):
"""Set window size. Size be y,x tuple. If y or x None, use legal max."""
n_lines, n_cols = size
+ getmaxyx = YX(*self.tui.stdscr.getmaxyx())
if n_lines is None:
- n_lines = self.tui.stdscr.getmaxyx()[0] - self.start[0]
+ n_lines = getmaxyx.y - self.start.y
if n_cols is None:
- n_cols = self.tui.stdscr.getmaxyx()[1] - self.start[1]
+ n_cols = getmaxyx.x - self.start.x
self.win.resize(n_lines, n_cols)
def __len__(self):
- return self.win.getmaxyx()[0] * self.win.getmaxyx()[1]
+ getmaxyx = YX(*self.win.getmaxyx())
+ return getmaxyx.y * getmaxyx.x
def safe_write(self, foo):
else: # workaround to <https://stackoverflow.com/q/7063128>
cut = chars_with_attrs[:len(self) - 1]
last_char_with_attr = chars_with_attrs[len(self) - 1]
- self.win.addstr(self.size[0] - 1, self.size[1] - 2,
+ self.win.addstr(self.size.y - 1, self.size.x - 2,
last_char_with_attr[0], last_char_with_attr[1])
- self.win.insstr(self.size[0] - 1, self.size[1] - 2, ' ')
+ self.win.insstr(self.size.y - 1, self.size.x - 2, ' ')
self.win.move(0, 0)
for char_with_attr in cut:
self.win.addstr(char_with_attr[0], char_with_attr[1])
def draw(self):
lines = self.get_text_lines()
- line_width = self.size[1]
+ line_width = self.size.x
to_join = []
for line in lines:
to_pad = line_width - (len(line) % line_width)
def get_text_lines(self):
lines = []
pos_i = self.tui.game.world.map_.\
- get_position_index(self.tui.examiner_position)
+ get_position_index(self.tui.examiner_position[1])
terrain = self.tui.game.world.map_.terrain[pos_i]
lines = [terrain]
for t in self.tui.game.world.things_at_pos(self.tui.examiner_position):
size = (1, len(self.tui.popup_text))
self.size = size
self.size_def = size
- offset_y = int((self.tui.stdscr.getmaxyx()[0] / 2) - (size[0] / 2))
- offset_x = int((self.tui.stdscr.getmaxyx()[1] / 2) - (size[1] / 2))
- self.start = (offset_y, offset_x)
- self.win.mvwin(self.start[0], self.start[1])
+ getmaxyx = YX(*self.tui.stdscr.getmaxyx())
+ offset_y = int(getmaxyx.y / 2 - size.y / 2)
+ offset_x = int(getmaxyx.x / 2 - size.x / 2)
+ self.start = YX(offset_y, offset_x)
+ self.win.mvwin(self.start.y, self.start.x)
class ItemsSelectorWidget(Widget):
t = self.tui.game.world.get_thing(id_)
lines += ['%s %s' % (pointer, t.type_)]
counter += 1
- line_width = self.size[1]
+ line_width = self.size.x
to_join = []
for line in lines:
to_pad = line_width - (len(line) % line_width)
if t.id_ in self.tui.game.world.player_inventory:
continue
pos_i = self.tui.game.world.map_.\
- get_position_index(t.position)
+ get_position_index(t.position[1])
symbol = self.tui.game.symbol_for_type(t.type_)
if terrain_as_list[pos_i][0] in {'f', '@', 'm'}:
old_symbol = terrain_as_list[pos_i][0]
terrain_as_list[pos_i] = symbol
if self.tui.examiner_mode:
pos_i = self.tui.game.world.map_.\
- get_position_index(self.tui.examiner_position)
+ get_position_index(self.tui.examiner_position[1])
terrain_as_list[pos_i] = (terrain_as_list[pos_i][0], '?')
return terrain_as_list
def pad_or_cut_x(lines):
- line_width = self.size[1]
+ line_width = self.size.x
for y in range(len(lines)):
line = lines[y]
if line_width > len(line):
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]]
+ if len(lines) < self.size.y:
+ to_pad = self.size.y - len(lines)
+ lines += to_pad * ['0' * self.size.x]
def lines_to_colored_chars(lines):
chars_with_attrs = []
center = self.tui.game.world.player.position
if self.tui.examiner_mode:
center = self.tui.examiner_position
+ indent_first_line = not bool(self.tui.game.world.offset.y % 2)
lines = self.tui.game.world.map_.\
- format_to_view(annotated_terrain, center, self.size)
+ format_to_view(annotated_terrain, center, self.size,
+ indent_first_line)
pad_or_cut_x(lines)
pad_y(lines)
self.safe_write(lines_to_colored_chars(lines))
self.parser = Parser(self.game)
self.to_update = {}
self.item_pointer = 0
- self.examiner_position = ((0,0), (0, 0))
+ self.examiner_position = (YX(0,0), YX(0, 0))
self.examiner_mode = False
self.popup_text = 'Hi bob'
self.to_send = []
def move_examiner(direction):
start_pos = self.examiner_position
- new_examine_pos = self.game.world.map_.move(start_pos, direction)
- if new_examine_pos:
+ new_examine_pos = self.game.map_geometry.move(start_pos, direction,
+ self.game.world.map_.size)
+ if new_examine_pos[0] == (0,0):
self.examiner_position = new_examine_pos
self.to_update['map'] = True
init_colors()
# With screen initialized, set up widgets with their curses windows.
- edit_widget = TextLineWidget('SEND:', self, (0, 0), (1, 20))
- edit_line_widget = EditWidget(self, (0, 6), (1, 14), ['edit'])
+ edit_widget = TextLineWidget('SEND:', self, YX(0, 0), YX(1, 20))
+ edit_line_widget = EditWidget(self, YX(0, 6), YX(1, 14), ['edit'])
edit_widget.children += [edit_line_widget]
- turn_widget = TextLineWidget('TURN:', self, (2, 0), (1, 20))
- turn_widget.children += [TurnWidget(self, (2, 6), (1, 14), ['turn'])]
- health_widget = TextLineWidget('HEALTH:', self, (3, 0), (1, 20))
- health_widget.children += [HealthWidget(self, (3, 8), (1, 12), ['turn'])]
- log_widget = LogWidget(self, (5, 0), (None, 20), ['log'])
- descriptor_widget = DescriptorWidget(self, (5, 0), (None, 20),
+ turn_widget = TextLineWidget('TURN:', self, YX(2, 0), YX(1, 20))
+ turn_widget.children += [TurnWidget(self, YX(2, 6), YX(1, 14), ['turn'])]
+ health_widget = TextLineWidget('HEALTH:', self, YX(3, 0), YX(1, 20))
+ health_widget.children += [HealthWidget(self, YX(3, 8), YX(1, 12), ['turn'])]
+ log_widget = LogWidget(self, YX(5, 0), YX(None, 20), ['log'])
+ descriptor_widget = DescriptorWidget(self, YX(5, 0), YX(None, 20),
['map'], False)
- map_widget = MapWidget(self, (0, 21), (None, None), ['map'])
+ map_widget = MapWidget(self, YX(0, 21), YX(None, None), ['map'])
inventory_widget = ItemsSelectorWidget('INVENTORY:',
self.game.world.player_inventory,
- self, (0, 21), (None,
- None), ['inventory'],
- False)
+ self, YX(0, 21), YX(None, None),
+ ['inventory'], False)
pickable_items_widget = ItemsSelectorWidget('PICKABLE:',
self.game.world.pickable_items,
- self, (0, 21),
- (None, None),
+ self, YX(0, 21),
+ YX(None, None),
['pickable_items'],
False)
top_widgets = [edit_widget, turn_widget, health_widget, log_widget,
descriptor_widget, map_widget, inventory_widget,
pickable_items_widget]
- popup_widget = PopUpWidget(self, (0, 0), (1, 1), visible=False)
+ popup_widget = PopUpWidget(self, YX(0, 0), YX(1, 1), visible=False)
# Ensure initial window state before loop starts.
for w in top_widgets:
projects / plomrogue2-experiments / blobdiff