quick

Author: primal-coder

CharActor/__init__.py

@@ -3,7 +3,6 @@
 from ._charactor import dicts as _dicts
 from ._charactor import create, BaseCharacters as _BaseCharacters, character_bank
 from ._objects._items import _Armory, _Goods
-from . import _entity
 
 log('Initializing CharActor.')
 log('Initializing character bank.')

CharActor/__log__.py

@@ -17,4 +17,4 @@ def log(message):
  if module.__name__ in ['__main__', 'CharActor']:
  return logger.log(99, message)
  caller = frame[3]
- return logger.log(99, f'{module.__name__[-module.__name__[::-1].index('.'):]}: {caller}: {message}')
+ return logger.log(99, f'{module.__name__[-module.__name__[::-1].index("."):]}: {caller}: {message}')

CharActor/_charactor/actor/_actor/_base_character.py

@@ -1,4 +1,3 @@
-from ...._entity import _base_entity
 from ._base_class_actors import *
 from ._base_race_actors import *
 
@@ -15,9 +14,4 @@
 
 for k, v in _base_characters.items():
  _char_list.extend(f'{k}{K}' for K in v.keys())
-
-for race in RACE_ATTRIBUTES:
- race = race.replace('-', '')
- for role in ROLE_ATTRIBUTES:
- setattr(_base_entity, f'{race}{role}', _base_characters[race][role])
-
+ 

CharActor/_charactor/actor/_actor/base_actor.py

@@ -5,7 +5,7 @@
 from random import randint as _randint
 from typing import Optional as _Optional, Any
 
-from entyty import AbstractEntity
+from entyty import _AbstractEntity as AbstractEntity
 
 import getch
 import pyglet.window as _window
@@ -450,7 +450,9 @@ def _init_inventory(self):
  log(f'Adding starting equipment: {self._role._starting_equipment}')
  for item in self._role._starting_equipment + self._background.equipment:
  if isinstance(item, list):
- if len(item) > 1 and (item[1] in Armory or item[1] in Goods):
+ if item == []:
+ continue
+ elif len(item) > 1 and (item[1] in Armory or item[1] in Goods):
  log(f'Adding {item[0]} {item[1]}')
  for _ in range(item[0]):
  self.inventory.add_item(item[1])
@@ -570,7 +572,7 @@ class BaseCharacter(BaseActor):
  """
  log('Initializing BaseCharacter class.')
  AbstractEntity.dispatcher.register_event_type('on_turn_end')
-
+ dispatcher = AbstractEntity.dispatcher
  def __init__(self, name, background: str, alignment: str, grid=None):
  from entyty import GridEntity
  character_class = self.__class__.__name__
@@ -591,6 +593,7 @@ def __init__(self, name, background: str, alignment: str, grid=None):
  self._create_properties()
  self._actions = {'move': {i: {'direction': None, 'from': None, 'distance': None, 'to': None} for i in range(self.speed//5)},
  'attack': {'target': None, 'weapon': None, 'result': None}, 'free': [], 'quick': []}
+ self._action_history = []
  self._is_turn = False
  self._nearby_items = {}
  self._target = None
@@ -620,7 +623,7 @@ def _create_properties(self):
  setattr(self.__class__, 'grid_entity', property(lambda self: self._grid_entity))
  properties = {
  'movements': self.grid_entity.movements,
- 'movements_remaining': self.grid_entity._movements_remaining,
+ 'movements_remaining': self.grid_entity.movements_remaining,
  'movement_queue': self.grid_entity.movement_queue,
  'cell': self.grid_entity.cell,
  'cell_name': self.grid_entity.cell_name,
@@ -634,6 +637,7 @@ def _create_properties(self):
  for attr, value in properties.items():
  setattr(self, attr, value)
  setattr(self.__class__, attr, property(lambda self, attr=attr: getattr(self.grid_entity, attr)))
+ self._push_handlers(on_turn_end=self.grid_entity.end_turn)
  else:
  for attr in ['movements', 'movements_remaining', 'movement_queue', 'cell', 'cell_name', 'cell_history', 'last_cell', 'x', 'y', 'position', 'path']:
  delattr(self, attr)
@@ -675,7 +679,9 @@ def _on_turn_change(self, actor):
  self._is_turn = True
 
  def end_turn(self):
- self.dispatcher.dispatch_event('on_turn_end', self.actions)
+ self._action_history.append(self.actions)
+ self.grid_entity.end_turn()
+ self.actions = None
 
  def _join_grid(self, grid):
  from entyty import GridEntity
@@ -697,10 +703,13 @@ def _set_target(self, target):
 
  def move(self, direction):
  if direction in ['north_west', 'north', 'north_east', 'east', 'south_east', 'south', 'south_west', 'west']:
- self.grid_entity.move_in_direction(direction)
+ mvmnt_index = self.grid_entity.move_in_direction(direction)
  self.actions['move'] = self.grid_entity.actions['move']
- return f'--> {self.actions["move"][len(self.actions["move"]) - 1]["to"]}'
-
+ if mvmnt_index is not None:
+ return f'{self.actions["move"][mvmnt_index]["from"]} --> {self.actions["move"][mvmnt_index]["to"]}'
+ else:
+ return f'Cannot move {direction}.'
+ 
  def attack(self):
  if 'attack' in self._actions.keys():
  print('Already attacked this turn.')

CharActor/_objects/_items/catalogues.py

@@ -159,7 +159,7 @@ def _get_class(self, item_name: str):
  return self.items[item_name]
 
  def _create_grid_meta(self, item_name, item_class):
- return type(item_name.replace(" ", "").replace(",", "_").replace("-",""), (GridItem, item_class), {'dispatcher': EventDispatcher()})
+ return type(item_name.replace(" ", "").replace(",", "_").replace("-",""), (item_class, ), {'dispatcher': EventDispatcher()})
 
  def _create_item_classes(self):
  for _item_name, _item_attr in _GENERAL_ITEMS_DICT.items():
@@ -192,23 +192,18 @@ def get(self, item_name: str, grid: object = None, cell: object = None):
  return item
  return self[item_name]
 
- # TODO Rename this here and in `get`
  def _create_griditem(self, item_name, grid, cell: _Union[str, type(Cell)]):
- item_instance = self[item_name]
- griditem_instance = item_instance._materialize(grid, cell)
- 
- # item_class = self._get_class(item_name)
- # combined_class = self._create_grid_meta(item_name, item_class)
- # cell = grid[cell] if cell is not None and isinstance(cell, str) else cell
- # griditem_instance = combined_class(grid, item_name, cell)
+ item_class = self._get_class(item_name)
+ item_meta = self._create_grid_meta(item_name, item_class)
+ cell = grid[cell] if cell is not None and isinstance(cell, str) else cell
+ griditem_instance = GridItem(grid, item_name, cell)
  if self._grid_instances.get(item_name, None) is not None:
  item_count = 1 + sum(bool(key.startswith(item_name))
  for key in list(self._grid_instances.keys()))
  self._grid_instances[f'{item_name}{item_count}'] = griditem_instance
  else:
  self._grid_instances[item_name] = griditem_instance
- return griditem_instance
-
+ return griditem_instance 
 
 
 Armory = _Armory()

CharActor/_objects/_items/item.py

@@ -38,7 +38,7 @@
 _TRADE_ITEMS_DICT = load_dict('trade_items')
 
 
-class AbstractItem(ABC, metaclass=type):
+class AbstractItem(ABC):
  _item_id = None 
  _name = None
  _category = None

entity.log

@@ -0,0 +1,18 @@
+w - Initializing abstract entity class.
+w - Initializing base entity class.
+w - Initializing entity class.
+w - Initializing logical entity class.
+w - Initializing visual entity class.
+w - Initializing abstract grid entity class.
+w - Initializing abstract entity class.
+w - Initializing base entity class.
+w - Initializing entity class.
+w - Initializing logical entity class.
+w - Initializing visual entity class.
+w - Initializing abstract grid entity class.
+w - Initializing abstract entity class.
+w - Initializing base entity class.
+w - Initializing entity class.
+w - Initializing logical entity class.
+w - Initializing visual entity class.
+w - Initializing abstract grid entity class.

gridengine.log

@@ -1,2 +1,26 @@
-2023-11-03 00:17:28,824 - GRIDENGINE - __log__ - Setting saves directory ...
-2023-11-03 00:17:28,824 - GRIDENGINE - __log__ - Saves directory set to /devel/boss/envs/CharActor/grid_engine/_saves/
+2023-11-04 17:44:39,794 - GRIDENGINE - __log__ - Setting saves directory ...
+2023-11-04 17:44:39,794 - GRIDENGINE - __log__ - Saves directory set to /devel/boss/envs/CharActor/grid_engine/_saves/
+2023-11-04 17:44:41,135 - GRIDENGINE - __log__ - process_grid(int)
+2023-11-04 17:44:41,135 - GRIDENGINE - __log__ - get_row_strings(int)
+2023-11-04 17:44:41,135 - GRIDENGINE - __log__ - generate_row_strings(int)
+2023-11-04 17:44:41,139 - GRIDENGINE - __log__ - get_column_strings(int)
+2023-11-04 17:44:41,139 - GRIDENGINE - __log__ - generate_column_strings(int)
+2023-11-04 17:44:41,139 - GRIDENGINE - __log__ - get_cell_strings(list)
+2023-11-04 17:44:41,139 - GRIDENGINE - __log__ - generate_cell_strings(list)
+2023-11-04 17:44:41,143 - GRIDENGINE - __log__ - get_cell_coordinates(int)
+2023-11-04 17:44:41,161 - GRIDENGINE - __log__ - get_grid_dict(list)
+2023-11-04 17:44:41,475 - GRIDENGINE - __log__ - generate_quadrant_coordinates(int)
+2023-11-04 17:44:41,475 - GRIDENGINE - __log__ - get_quadrant_indices(list)
+2023-11-04 17:44:41,510 - GRIDENGINE - __log__ - generate_adjacency(dict)
+2023-11-04 17:44:41,961 - GRIDENGINE - __log__ - _init_terrain(TerrainGridBlueprint)
+2023-11-04 17:44:42,269 - GRIDENGINE - __log__ - _set_base_terrain(TerrainGridBlueprint)
+2023-11-04 17:44:42,323 - GRIDENGINE - __log__ - _adjust_passability(TerrainGridBlueprint)
+2023-11-04 17:44:44,220 - GRIDENGINE - __log__ - set_rivers(Terraformer)
+2023-11-04 17:44:44,221 - GRIDENGINE - __log__ - generate_realistic_river(Terraformer)
+2023-11-04 17:44:44,221 - GRIDENGINE - __log__ - get_river_by_walk(Terraformer)
+2023-11-04 17:44:44,223 - GRIDENGINE - __log__ - expand_river_path(Terraformer)
+2023-11-04 17:44:44,250 - GRIDENGINE - __log__ - generate_realistic_river(Terraformer)
+2023-11-04 17:44:44,250 - GRIDENGINE - __log__ - get_river_by_walk(Terraformer)
+2023-11-04 17:44:44,251 - GRIDENGINE - __log__ - expand_river_path(Terraformer)
+2023-11-04 17:44:44,259 - GRIDENGINE - __log__ - get_river_banks(Terraformer)
+2023-11-04 17:44:44,263 - GRIDENGINE - __log__ - expand_riverbanks(Terraformer)