sunday

Author: primal-coder

CharActor/__init__.py

@@ -1,21 +1,23 @@
 from typing import Union as _Union
 from .__log__ import logger, log
-from ._charactor import dicts as _dicts
+from ._charactor.dicts import load_all_dicts, load_dict, load_list
 from ._charactor import create, BaseCharacters as _BaseCharacters, character_bank
 from ._objects._items import _Armory, _Goods
 
 log('Initializing CharActor.')
 log('Initializing character bank.')
 
+
 class _Catalogues:
     log('Initializing catalogues.')
     Armory = None
     Goods = None
+
     def __init__(self):
         self.Armory = _Armory()
         self.Goods = _Goods()
-        
-    def get(self, item_name: str = None, grid = None, cell = None):
+
+    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):
@@ -26,11 +28,12 @@ def get(self, item_name: str = None, grid = None, cell = None):
         elif item_name in self.Goods:
             return self.Goods.get(item_name, grid, cell)
         else:
-            print(f'Item {item_name} not found in catalogues.')
+            print(f'Item {item_name} not in catalogues.')
             return None
 
+
 log('Creating catalogue instance.')
-        
+
 Catalogues = _Catalogues()
 
-del log, logger
+del log, logger

CharActor/__log__.py

@@ -1,8 +1,11 @@
+import time
 import logging as _logging
 
+date = time.strftime('%Y-%m-%d', time.localtime())
+
 _logging.addLevelName(99, 'CHARACTOR')
 logger = _logging.getLogger('CHARACTOR')
-file_handler = _logging.FileHandler('logs/charactor.log', 'w')
+file_handler = _logging.FileHandler(f'logs/{date}.log', 'w')
 formatter = _logging.Formatter('%(asctime)s - %(message)s')
 file_handler.setFormatter(formatter)
 file_handler.setLevel(99)

CharActor/_charactor/__init__.py

@@ -1,3 +1,3 @@
 from .actor import create, BaseCharacters, character_bank
 from . import dicts
-from .dicts import load_all_dicts, load_dict, load_list
+from .dicts import load_all_dicts, load_dict, load_list

CharActor/_charactor/actor/_actor/base_actor.py

@@ -460,9 +460,10 @@ def _init_inventory(self):
                     self.inventory.add_item(item[0])
             elif item in ['Leather Armor', 'Light Leather', 'Scale Mail', 'Chain Mail', 'Plate Mail', 'Tunic']:
                 log(f'Building armor set: {item} ')
-                for piece in Armory.armor_manifest:
-                    piece_ = Armory[piece]
+                for piece_ in Armory.items.values():
+                    piece_ = piece_()
                     if piece_.set_name == item:
+                        piece_ = piece_()
                         log(f'{piece_.name} found in Armory')
                         self._add_and_equip_piece(piece_)
                         if isinstance(piece_.slot, list):

CharActor/_charactor/dicts/backgrounds.json

@@ -343,7 +343,13 @@
         "skills":null,
         "tools":null,
         "languages":null,
-        "equipment":null,
+        "equipment":[
+            "Common Clothes",
+            [
+                10,
+                "Gold Piece"
+            ]
+        ],
         "special":null
     }
 }

CharActor/_charactor/dicts/general_items.json

@@ -302,7 +302,7 @@
         "quest_item": false,
         "relic": false
     },
-    "Lock and Key": {
+    "Lock And Key": {
         "item_id": 19,
         "name": "Lock and Key",
         "category": "TOOLS",
@@ -942,7 +942,7 @@
         "quest_item": false,
         "relic": false
     },
-    "Flint and Steel": {
+    "Flint And Steel": {
         "item_id": 51,
         "name": "Flint and Steel",
         "category": "TOOLS",

CharActor/_charactor/dicts/weapons.json

@@ -919,7 +919,7 @@
             "HEAVY"
         ]
     },
-    "Short-bow": {
+    "Shortbow": {
         "name": "Short-bow",
         "item_id": 164,
         "slot": "MAIN_HAND",
@@ -953,7 +953,7 @@
             "LIGHT"
         ]
     },
-    "Crossbow, light": {
+    "Crossbow, Light": {
         "name": "Crossbow, light",
         "item_id": 165,
         "slot": "MAIN_HAND",
@@ -988,7 +988,7 @@
             "TWO_HANDED"
         ]
     },
-    "Crossbow, hand": {
+    "Crossbow, Hand": {
         "name": "Crossbow, hand",
         "item_id": 166,
         "slot": "MAIN_HAND",
@@ -1022,7 +1022,7 @@
             "LIGHT"
         ]
     },
-    "Crossbow, heavy": {
+    "Crossbow, Heavy": {
         "name": "Crossbow, heavy",
         "item_id": 167,
         "slot": "MAIN_HAND",