Rejoice!

Author: primal-coder

.gitignore

@@ -4,7 +4,8 @@ CharActor.egg-info
 dist/
 .idea
 __pycache__
-__pycache__/*
+*/__pycache__/*
 .monster
 character_bank/
-*.pyc
+*.pyc
+*.log

.python-version

@@ -0,0 +1 @@
+3.12-dev

CharActor/README.md

@@ -1,20 +1,16 @@
 # Import CharActor as ca
 
 Importing `CharActor as ca` is just a convention. But it's a good one. It's short and sweet. Upon doing so you are granted public access to the following:
-    
+
 * `ca.character_bank` - The character bank will have no public attributes until you create a character.
-* `ca.create` - The create function can, you guessed it, create a character. It accepts a number of parameters, but none are necessary, they are as follows; `obj_name`, `name`, `role`, `race`, `background`, `alignment` and `grid`. 
-  `obj_name` will designate the identifier assigned to `ca.character_bank`. 
-* `ca.load_dict` - The load_dict function can be used to load one of the many json file is the `CharActor/_charactor/actor/dicts/` directory. It accepts a single parameter, `dict_name`, which is the name of the json file you wish to load.
-* `ca.load_list` - See above, but for lists saved as json.
-* `ca.load_dicts` - Returns a dictionary of all the json files.
-* `ca.Catalogues` - Provides access to the `ca.Catalogues.get` method, which can be used to produce an Item object from either `ca.Catalogues.Goods` or `ca.Catalogues.Armory`.
-
-## Creating a Character
+* `ca.create` - The create function can, you guessed it, create a character. It accepts a number of parameters, but none are necessary, they are as follows; `obj_name`, `name`, `role`, `race`, `background`, `alignment` and `grid`.
+
+## ca.create()
+
 Creating a character is easy. You can do it in one line. But first, let's look at the parameters.
 
-* `obj_name` - This is the identifier that will be assigned to the character. It is not necessary, but it is recommended. If you do not provide one, the character will be assigned a sequenced identifier, (e.g. `char1`, `char2`, etc.) 
-* `name` - The name of the character. Will default to 'Unnamed' if not provided.
+* `obj_name` - This is the identifier that will be assigned to the character. It is not necessary, but it is recommended. If you do not provide one, the character will be assigned a sequenced identifier, (e.g. `char1`, `char2`, etc.)
+* `name` - The name of the character will default to 'Unnamed' if not provided.
 * `role` - A string, representative of the character's role(traditionally referred to as 'class'). Will be randomly selected if not provided. The available roles are as follows:
   * 'Barbarian'
   * 'Bard'
@@ -38,7 +34,7 @@ Creating a character is easy. You can do it in one line. But first, let's look a
   * 'Halfling'
   * 'Human'
   * 'Tiefling'
-* `background` - A string, representative of the character's background. Will be randomly selected if not provided. The available backgrounds are as follows: 
+* `background` - A string, representative of the character's background. Will be randomly selected if not provided. The available backgrounds are as follows:
   * 'Acolyte'
   * 'Charlatan'
   * 'Criminal'
@@ -52,7 +48,7 @@ Creating a character is easy. You can do it in one line. But first, let's look a
   * 'Sailor'
   * 'Soldier'
   * 'Urchin'
-* `alignment` - A string, representative of the character's alignment. Will be randomly selected if not provided. The available alignments are as follows: 
+* `alignment` - A string, representative of the character's alignment. Will be randomly selected if not provided. The available alignments are as follows:
   * 'Lawful Good'
   * 'Neutral Good'
   * 'Chaotic Good'
@@ -67,7 +63,7 @@ Creating a character is easy. You can do it in one line. But first, let's look a
 
 Depending on your shell, you may be able to use tab completion once you've created a character. If you're using a shell that doesn't support tab completion, you can use the `dir` function to see what attributes are available to you. Upon creating an a character instance, if you prepare a statement with the character's identifier, followed by a period, and then press tab, you will be presented with a list of attributes and methods available to you.
 
-#### Example
+### ca.create() Example
 
 ```python
 >>> import CharActor as ca
@@ -81,4 +77,27 @@ char1.Custom         char1.actions          char1.end_turn()       char1.invento
 char1.Dexterity      char1.age              char1.entity_id        char1.level            char1.scene            
 char1.Good           char1.armor_class      char1.events           char1.look_around()    char1.skill_points     
 char1.Halfling       char1.attack()         char1.experience       char1.move(            char1.skillbook 
-```
+```
+
+Some of the attributes you will see are dynamically generated based on the parameters(see above) you provided when creating the character. For example, if you created a character with the role of 'Bard', you will see the attribute `char1.Bard`. This dynamic attribute has a static counterpart, which is always available. For example, `char1.Bard` and `char1._Role` are the same attribute. The dynamic attributes are there for convenience.
+
+## ca.character_bank
+
+The character bank is a dictionary of all the characters you've created. You can access it directly, but it's recommended that you use the `ca.character_bank` attribute instead. The character bank is a dictionary of character instances, with the keys being the identifiers you assigned to them. For example, if you created a character with the identifier of 'char1', you can access it by calling `ca.character_bank.char1`. You can easily assign a character to a new variable using the usual syntax. For example, `char1 = ca.character_bank.char1`.
+
+### ca.character_bank Example
+
+```python
+>>> import CharActor as ca
+>>> ca.create() # Creates a character with the identifier 'char1'
+>>> char1 = ca.character_bank.char1
+>>> char1.name
+'Unnamed'
+>>> char1.name = 'Bob'
+>>> char1.name
+'Bob'
+```
+
+## Using CharActor with other modules
+
+CharActor is designed to be used in conjunction with gridengine_framework, CharObj, CharTask,  

CharActor/__init__.py

@@ -2,48 +2,48 @@
 from .__log__ import logger, log
 from ._charactor.dicts import load_all_dicts, load_dict, load_list
 from ._charactor import create, BaseCharacters as _BaseCharacters, character_bank
-
-from CharObj import Armory as _Armory, Goods as _Goods, get_item as _get_item
+from ._charactor.actor._actor.base_actor import BaseActor as _BaseActor, BaseCharacter as Charactor
+# from CharObj import Armory as _Armory, Goods as _Goods, get_item as _get_item
 #from ._objects._items import _Armory, _Goods
 
 log('Initializing CharActor.')
 log('Initializing character bank.')
 
 
-class _Catalogues:
-    log('Initializing catalogues.')
-    Armory = None
-    Goods = None
+# class _Catalogues:
+#     log('Initializing catalogues.')
+#     Armory = None
+#     Goods = None
 
-    def __init__(self):
-        self.Armory = _Armory
-        self.Goods = _Goods
-        self.Item_Bank = []
+#     def __init__(self):
+#         self.Armory = _Armory
+#         self.Goods = _Goods
+#         self.Item_Bank = []
 
-    def get_item(self, term):
-        return _get_item(term)
-
-    def get(self, item_name: str = None, grid=None, cell=None):
-        if item_name is None:
-            return
-        if None not in [grid, cell] and isinstance(cell, str):
-            cell = grid[cell]
-        item_name = item_name
-        if item_name in self.Armory:
-            item = self.Armory.get(item_name, grid, cell)
-            self.Item_Bank.append(item)
-            return item
-        elif item_name in self.Goods:
-            item = self.Goods.get(item_name, grid, cell)
-            self.Item_Bank.append(item)
-            return item
-        else:
-            print(f'Item {item_name} not in catalogues.')
-            return None
-
-log('Creating catalogue instance.')
-
-Catalogues = _Catalogues()
+#     def get_item(self, term):
+#         return _get_item(term)
+
+#     def get(self, item_name: str = None, grid=None, cell=None):
+#         if item_name is None:
+#             return
+#         if None not in [grid, cell] and isinstance(cell, str):
+#             cell = grid[cell]
+#         item_name = item_name
+#         if item_name in self.Armory:
+#             item = self.Armory.get(item_name, grid, cell)
+#             self.Item_Bank.append(item)
+#             return item
+#         elif item_name in self.Goods:
+#             item = self.Goods.get(item_name, grid, cell)
+#             self.Item_Bank.append(item)
+#             return item
+#         else:
+#             print(f'Item {item_name} not in catalogues.')
+#             return None
+
+# log('Creating catalogue instance.')
+
+# Catalogues = _Catalogues()
 
 
 

CharActor/__log__.py

@@ -5,7 +5,7 @@
 
 _logging.addLevelName(99, 'CHARACTOR')
 logger = _logging.getLogger('CHARACTOR')
-file_handler = _logging.FileHandler(f'logs/{date}.log', 'w')
+file_handler = _logging.FileHandler(f'logs/{date}.log', 'a')
 formatter = _logging.Formatter('%(asctime)s - %(message)s')
 file_handler.setFormatter(formatter)
 file_handler.setLevel(99)

CharActor/_character_bank.py

@@ -1,5 +1,5 @@
 import pickle as _pickle
-
+import json as _json
 from CharActor._quiet_dict import QuietDict as _QuietDict
 from ._charactor.actor._actor import _character_list, _ALIGNMENTS, _BACKGROUNDS
 
@@ -10,8 +10,8 @@ class _create(_QuietDict):
     @staticmethod
     def random_character(obj_name=None, name='Unnamed'):
         import random as _random
-        alignment = _random.choice(list(_ALIGNMENTS.keys()))
-        background = _random.choice(list(_BACKGROUNDS.keys()))
+        alignment = _random.choice(list(_ALIGNMENTS.keys()).remove('Unaligned'))
+        background = _random.choice(list(_BACKGROUNDS.keys()).remove('Custom'))
         return f'{obj_name} = _Create.{_char_list[_random.randint(0, len(_char_list) - 1)]}("{name}", "{background}", "{alignment}")'
 
     def __init__(self):
@@ -71,3 +71,8 @@ def _save_character(self, character, file_name):
 for _k in _character_list.__dict__.copy().keys():
     if _k not in _char_list and _k not in  ['random_character', '_char_list']:
         delattr(_character_list, _k)
+
+
+def _load_character(file_name):
+    with open(f'{file_name}.json') as file:
+        chardict = _json.load(file)

CharActor/_charactor/actor/_actor/base_actor.py

@@ -176,7 +176,7 @@ def tab(tabs=1):
             item_count += 1
         items = of_items()
         piece_of_equipment = of_equipment()
-        return f"""A level {self.level} {self._alignment} {self._race.title} {self._role.title}
+        return f"""A level {self.level} {self._alignment} {self._race.title} {self._role.title} {self._background.title} named {self.name}
     
 {self.Strength}\tInitiative: {self.initiative}\t\tEquipment:
 {self.Dexterity}\tHP: {self.hp}\t\t\t{next(piece_of_equipment) if equipment_count > 0 else ''}\t\t{next(piece_of_equipment) if equipment_count > 1 else ''}\t{next(piece_of_equipment) if equipment_count > 2 else '' }\t\t{next(piece_of_equipment) if equipment_count > 3 else ''}
@@ -269,9 +269,6 @@ def __getstate__(self):
                 del state[k]
             if k in ['_role', '_race', '_background', '_alignment']:
                 state[k] = v.title
-            if k == '_abilities':
-                for K, V in state['_abilities'].items():
-                    state['_abilities'][K] = V.score
         return state
 
     def __setstate__(self, state):
@@ -658,6 +655,14 @@ def _create_properties(self):
         else:
             for attr in ['movements', 'movement_queue', 'movement_energy', 'cell', 'cell_name', 'cell_history', 'last_cell', 'x', 'y', 'position', 'path']:
                 delattr(self, attr)
+                
+    @property
+    def grid(self):
+        return self._grid
+    
+    @grid.setter
+    def grid(self, grid):
+        self._grid = grid
 
     @property
     def actions(self) -> dict[str, dict[str, Any]]:
@@ -752,11 +757,11 @@ def _extracted_from_move_18(self, direction, FROM):
         return f'{FROM} --> {TO}'
 
     def attack(self):
-        if self.actions['attack'] != {'target': None, 'weapon': None, 'result': None}:
-            return 'You have already attacked this turn.'
-        elif self._target is None:
+        # if self.actions['attack'] != {'target': None, 'weapon': None, 'result': None}:
+        #     return 'You have already attacked this turn.'
+        if self._target is None:
             return 'No target.'
-        elif hasattr(self, 'grid') and self.grid is not None and self.grid.get_distance(self.cell_name, self._target.cell_name) > self.inventory.equipment['MAIN_HAND'].range:
+        elif hasattr(self, 'grid') and self.grid is not None and self.grid.get_distance(self.cell_name, self._target.cell_name) > self.inventory.equipment['MAIN_HAND'].weapon_range[0]:
             return 'Target out of range.'
         else:
             log(f'{self.name} and {self.target.name} do not inhabit a grid, so attack is emulated. Combatants are assumed to be within range of each other.')