Moved mech #7

Merged
TorstenHettstedt merged 8 commits from moved_mech into main 2026-09-26 16:42:14 +02:00
2 changed files with 241 additions and 119 deletions
Showing only changes of commit 56235ced39 - Show all commits
+239 -117
View File
@@ -1,11 +1,11 @@
from hangar.mech import Mech
from mech_factory.component_storage import InnerStructure, Area, AreaNames, OuterAmor, Zone, ZoneNames
from mech_factory.component_storage.items import Gyroskope, Item
from mech_factory.component_storage.items import Cockpit, Gyroskope, Item, Reaktor
from mech_factory.store import ItemStore, ComponentStore, InnerAmorStore
from mech_factory.watcher import Watcher
class MechFabrik(object):
class MechBuilder(object):
def __init__(self, name: str, tonnage: float, movement_rate: int):
self.__name = name
@@ -13,15 +13,14 @@ class MechFabrik(object):
self.__movement_rate = movement_rate
inner_armor_store = InnerAmorStore(tonnage)
self._watcher = Watcher(tonnage, inner_armor_store)
self.__areas = dict()
self.__zones = dict()
self.__areas = AreaDict()
self._item_store = ItemStore()
self._component_store = ComponentStore(tonnage, movement_rate)
AreaBuilder.set_inner_amor_store(inner_armor_store)
AreaBuilder.set_watcher(self._watcher)
AbstractMechFactory.set_stores(inner_armor_store, self._component_store, self._item_store)
AbstractMechFactory.set_watcher(self._watcher)
self.__outer_armor_builder = OuterArmorFactory()
self._inner_structure = self._component_store.get_inner_structure()
self._watcher.add_item(self._inner_structure)
self._watcher.add_item(self._inner_structure.gyroskope)
self._build_areas()
@property
@@ -29,7 +28,7 @@ class MechFabrik(object):
return self._watcher
def _build_areas(self) -> None:
self.__build_torso_areas(self._inner_structure.gyroskope)
self.__build_torso_areas()
self.__build_head_area()
self.__build_arm_leg(AreaNames.RIGHT_ARM, AreaNames.RIGHT_TORSO)
self.__build_arm_leg(AreaNames.RIGHT_LEG, AreaNames.RIGHT_TORSO)
@@ -37,148 +36,182 @@ class MechFabrik(object):
self.__build_arm_leg(AreaNames.LEFT_LEG, AreaNames.LEFT_TORSO)
def __build_head_area(self) -> None:
area_factory = AreaBuilder(AreaNames.HEAD, self.__areas[AreaNames.MIDDLE_TORSO])
self.__areas[AreaNames.HEAD] = area_factory.area
self.__zones.update(area_factory.outer_armors)
cockpit = self._item_store.get_cockpit()
self.__areas[AreaNames.HEAD].cockpit = cockpit
area_factory.add_item((1, 1), self._item_store.get_sustainment(), )
area_factory.add_item((1, 2), self._item_store.get_sensors(), )
area_factory.add_item((1, 3), cockpit, )
area_factory.add_item((1, 5), self._item_store.get_sensors(), )
area_factory.add_item((1, 6), self._item_store.get_sustainment(), )
area_factory = AreaFactory(AreaNames.HEAD, self.__areas[AreaNames.MIDDLE_TORSO].area)
self.__areas[AreaNames.HEAD] = area_factory
self.__outer_armor_builder.add_area(AreaNames.HEAD, area_factory.area)
def __build_torso_areas(self, gyroscope: Gyroskope) -> None:
area_factory = AreaBuilder(AreaNames.MIDDLE_TORSO, None)
reactor = self._component_store.get_reaktor()
area_factory.add_item((1, 1), reactor, )
area_factory.add_item((1, 2), reactor, )
area_factory.add_item((1, 3), reactor, )
area_factory.add_item((1, 4), gyroscope, )
area_factory.add_item((1, 5), gyroscope, )
area_factory.add_item((1, 6), gyroscope, )
area_factory.add_item((2, 1), gyroscope, )
area_factory.add_item((2, 2), reactor, )
area_factory.add_item((2, 3), reactor, )
area_factory.add_item((2, 4), reactor, )
area_factory.area.reactor = reactor
self.__areas[AreaNames.MIDDLE_TORSO] = area_factory.area
self.__zones.update(area_factory.outer_armors)
def __build_torso_areas(self) -> None:
area_factory = AreaFactory(AreaNames.MIDDLE_TORSO, None)
self.__areas[AreaNames.MIDDLE_TORSO] = area_factory
self.__outer_armor_builder.add_area(AreaNames.MIDDLE_TORSO, area_factory.area)
area_factory = AreaBuilder(AreaNames.LEFT_TORSO, self.__areas[AreaNames.MIDDLE_TORSO])
self.__areas[AreaNames.LEFT_TORSO] = area_factory.area
self.__zones.update(area_factory.outer_armors)
area_factory = AreaFactory(AreaNames.LEFT_TORSO, self.__areas[AreaNames.MIDDLE_TORSO].area)
self.__areas[AreaNames.LEFT_TORSO] = area_factory
self.__outer_armor_builder.add_area(AreaNames.LEFT_TORSO, area_factory.area)
area_factory = AreaBuilder(AreaNames.RIGHT_TORSO, self.__areas[AreaNames.MIDDLE_TORSO])
self.__areas[AreaNames.RIGHT_TORSO] = area_factory.area
self.__zones.update(area_factory.outer_armors)
area_factory = AreaFactory(AreaNames.RIGHT_TORSO, self.__areas[AreaNames.MIDDLE_TORSO].area)
self.__areas[AreaNames.RIGHT_TORSO] = area_factory
self.__outer_armor_builder.add_area(AreaNames.RIGHT_TORSO, area_factory.area)
def __build_arm_leg(self, index: AreaNames, parent_index: AreaNames) -> None:
area_factory = AreaBuilder(index, self.__areas[parent_index])
area_factory.add_item((1, 1), self._item_store.get_joint(), )
area_factory.add_item((1, 2), self._item_store.get_activator(), )
area_factory.add_item((1, 3), self._item_store.get_activator(), )
area_factory.add_item((1, 4), self._item_store.get_activator(), )
self.__areas[index] = area_factory.area
self.__zones.update(area_factory.outer_armors)
area_factory = AreaFactory(index, self.__areas[parent_index].area)
self.__areas[index] = area_factory
self.__outer_armor_builder.add_area(index, area_factory.area)
def auslieferung(self) -> Mech:
for (index, area) in self.__areas.items():
self._inner_structure.add_area(index, area)
for (index, outer_amor) in self.__zones.items():
for (index, area_factory) in self.__areas:
self._inner_structure.add_area(index, area_factory.area)
for (index, outer_amor) in self.__outer_armor_builder:
self._inner_structure.add_zone(index, outer_amor)
return Mech(self.__name, self.__tonnage, self.__movement_rate, self._inner_structure)
def set_head_armor(self, armor: int) -> None:
self._watcher.add_armor(AreaNames.HEAD, armor)
self.__zones[ZoneNames.HEAD].armor = armor
self.__outer_armor_builder.set_head_armor(armor)
def set_middle_torso_armor(self, armor_front: int, armor_rear: int) -> None:
self._watcher.add_armor(AreaNames.MIDDLE_TORSO, armor_front + armor_rear)
self.__zones[ZoneNames.MIDDLE_TORSO_FRONT].armor = armor_front
self.__zones[ZoneNames.MIDDLE_TORSO_REAR].armor = armor_rear
self.__outer_armor_builder.set_middle_torso_armor(armor_front, armor_rear)
def set_side_torso_armor(self, armor_front: int, armor_rear: int) -> None:
self._watcher.add_armor(AreaNames.LEFT_TORSO, armor_front + armor_rear)
self.__zones[ZoneNames.LEFT_TORSO_FRONT].armor = armor_front
self.__zones[ZoneNames.LEFT_TORSO_REAR].armor = armor_rear
self._watcher.add_armor(AreaNames.RIGHT_TORSO, armor_front + armor_rear)
self.__zones[ZoneNames.RIGHT_TORSO_FRONT].armor = armor_front
self.__zones[ZoneNames.RIGHT_TORSO_REAR].armor = armor_rear
self.__outer_armor_builder.set_side_torso_armor(armor_front, armor_rear)
def set_arm_armor(self, armor: int) -> None:
self._watcher.add_armor(AreaNames.LEFT_ARM, armor)
self.__zones[ZoneNames.LEFT_ARM].armor = armor
self._watcher.add_armor(AreaNames.RIGHT_ARM, armor)
self.__zones[ZoneNames.RIGHT_ARM].armor = armor
self.__outer_armor_builder.set_arm_armor(armor)
def set_leg_armor(self, armor: int) -> None:
self._watcher.add_armor(AreaNames.LEFT_LEG, armor)
self.__zones[ZoneNames.LEFT_LEG].armor = armor
self._watcher.add_armor(AreaNames.RIGHT_LEG, armor)
self.__zones[ZoneNames.RIGHT_LEG].armor = armor
self.__outer_armor_builder.set_leg_armor(armor)
def add_jump_jet(self, area_name: AreaNames, count: int) -> None:
for index in range(count):
self._add_item(area_name, self._component_store.get_jump_jet())
def _add_item(self, area_name: AreaNames, area_item: Item) -> None:
for (index, item) in self.__areas[area_name].items.items():
if item is not None:
continue
self.__add_item_to_areas(area_name, index, area_item)
return
raise UserWarning('no more space')
self.__areas[area_name].add_item(area_item)
def __add_item_to_areas(self, area_name: AreaNames, index: tuple, item: Item) -> None:
self.__areas[area_name].items[index] = item
self._watcher.add_item(item)
class AreaDict:
def __init__(self):
self.__areas = {}
def __setitem__(self, key, value):
if not isinstance(key, AreaNames):
raise TypeError("key must be an AreaNames object")
if not isinstance(value, AreaFactory):
raise TypeError("value must be an AreaFactory object")
self.__areas[key] = value
def __getitem__(self, key) -> AreaFactory:
if not isinstance(key, AreaNames):
raise TypeError("key must be an AreaNames object")
if key not in self.__areas:
raise KeyError("AreaFactory does not exist")
return self.__areas[key]
def __iter__(self):
for (index, area_factory) in self.__areas.items():
yield index, area_factory
class AreaBuilder:
class AbstractMechFactory:
_inner_amor_store = None
_component_store = None
_item_store = None
_watcher = None
@classmethod
def set_stores(cls, inner_amor: InnerAmorStore, component: ComponentStore, item: ItemStore) -> None:
cls._inner_amor_store = inner_amor
cls._component_store = component
cls._item_store = item
@classmethod
def set_inner_amor_store(cls, inner_amor_store: InnerAmorStore) -> None:
cls._inner_amor_store = inner_amor_store
@classmethod
def set_component_store(cls, component_store: ComponentStore) -> None:
cls._component_store = component_store
@classmethod
def set_watcher(cls, my_watcher: Watcher) -> None:
cls._watcher = my_watcher
class OuterArmorFactory(AbstractMechFactory):
def __init__(self):
super().__init__()
self._my_zones = {}
def add_area(self, area_name: AreaNames, area: Area) -> None:
match area_name:
case AreaNames.HEAD:
self._my_zones[ZoneNames.HEAD] = OuterAmor(area)
case AreaNames.MIDDLE_TORSO:
self._my_zones[ZoneNames.MIDDLE_TORSO_FRONT] = OuterAmor(area)
self._my_zones[ZoneNames.MIDDLE_TORSO_REAR] = OuterAmor(area)
case AreaNames.LEFT_TORSO:
self._my_zones[ZoneNames.LEFT_TORSO_FRONT] = OuterAmor(area)
self._my_zones[ZoneNames.LEFT_TORSO_REAR] = OuterAmor(area)
case AreaNames.RIGHT_TORSO:
self._my_zones[ZoneNames.RIGHT_TORSO_FRONT] = OuterAmor(area)
self._my_zones[ZoneNames.RIGHT_TORSO_REAR] = OuterAmor(area)
case AreaNames.LEFT_ARM:
self._my_zones[ZoneNames.LEFT_ARM] = OuterAmor(area)
case AreaNames.RIGHT_ARM:
self._my_zones[ZoneNames.RIGHT_ARM] = OuterAmor(area)
case AreaNames.LEFT_LEG:
self._my_zones[ZoneNames.LEFT_LEG] = OuterAmor(area)
case AreaNames.RIGHT_LEG:
self._my_zones[ZoneNames.RIGHT_LEG] = OuterAmor(area)
def set_head_armor(self, armor: int) -> None:
self._watcher.add_armor(AreaNames.HEAD, armor)
self._my_zones[ZoneNames.HEAD].armor = armor
def set_middle_torso_armor(self, armor_front: int, armor_rear: int) -> None:
self._watcher.add_armor(AreaNames.MIDDLE_TORSO, armor_front + armor_rear)
self._my_zones[ZoneNames.MIDDLE_TORSO_FRONT].armor = armor_front
self._my_zones[ZoneNames.MIDDLE_TORSO_REAR].armor = armor_rear
def set_side_torso_armor(self, armor_front: int, armor_rear: int) -> None:
self._watcher.add_armor(AreaNames.LEFT_TORSO, armor_front + armor_rear)
self._my_zones[ZoneNames.LEFT_TORSO_FRONT].armor = armor_front
self._my_zones[ZoneNames.LEFT_TORSO_REAR].armor = armor_rear
self._watcher.add_armor(AreaNames.RIGHT_TORSO, armor_front + armor_rear)
self._my_zones[ZoneNames.RIGHT_TORSO_FRONT].armor = armor_front
self._my_zones[ZoneNames.RIGHT_TORSO_REAR].armor = armor_rear
def set_arm_armor(self, armor: int) -> None:
self._watcher.add_armor(AreaNames.LEFT_ARM, armor)
self._my_zones[ZoneNames.LEFT_ARM].armor = armor
self._watcher.add_armor(AreaNames.RIGHT_ARM, armor)
self._my_zones[ZoneNames.RIGHT_ARM].armor = armor
def set_leg_armor(self, armor: int) -> None:
self._watcher.add_armor(AreaNames.LEFT_LEG, armor)
self._my_zones[ZoneNames.LEFT_LEG].armor = armor
self._watcher.add_armor(AreaNames.RIGHT_LEG, armor)
self._my_zones[ZoneNames.RIGHT_LEG].armor = armor
def __iter__(self):
for (index, outer_amor) in self._my_zones.items():
yield index, outer_amor
@property
def outer_armors(self) -> dict[ZoneNames, OuterAmor]:
return self._my_zones
class AreaFactory(AbstractMechFactory):
def __init__(self, area_name: AreaNames, parent: Area | None) -> None:
super().__init__()
self.__area_name = area_name
self._set_parent = parent
self._my_area = Area()
self._my_area.parent = parent
if parent is not None:
parent.children.append(self._my_area)
self._is_big_area = self.__area_name.is_big()
self._my_zones = dict()
self._my_area.parent = parent
self._area_item_factory = AreaItemsFactory(self)
self._set_armor()
self._set_outer_armor()
self._set_lines()
def _set_outer_armor(self) -> None:
match self.__area_name:
case AreaNames.HEAD:
self._my_zones[ZoneNames.HEAD] = OuterAmor(self._my_area)
case AreaNames.MIDDLE_TORSO:
self._my_zones[ZoneNames.MIDDLE_TORSO_FRONT] = OuterAmor(self._my_area)
self._my_zones[ZoneNames.MIDDLE_TORSO_REAR] = OuterAmor(self._my_area)
case AreaNames.LEFT_TORSO:
self._my_zones[ZoneNames.LEFT_TORSO_FRONT] = OuterAmor(self._my_area)
self._my_zones[ZoneNames.LEFT_TORSO_REAR] = OuterAmor(self._my_area)
case AreaNames.RIGHT_TORSO:
self._my_zones[ZoneNames.RIGHT_TORSO_FRONT] = OuterAmor(self._my_area)
self._my_zones[ZoneNames.RIGHT_TORSO_REAR] = OuterAmor(self._my_area)
case AreaNames.LEFT_ARM:
self._my_zones[ZoneNames.LEFT_ARM] = OuterAmor(self._my_area)
case AreaNames.RIGHT_ARM:
self._my_zones[ZoneNames.RIGHT_ARM] = OuterAmor(self._my_area)
case AreaNames.LEFT_LEG:
self._my_zones[ZoneNames.LEFT_LEG] = OuterAmor(self._my_area)
case AreaNames.RIGHT_LEG:
self._my_zones[ZoneNames.RIGHT_LEG] = OuterAmor(self._my_area)
def _set_armor(self) -> None:
match self.__area_name:
@@ -193,24 +226,113 @@ class AreaBuilder:
case AreaNames.LEFT_LEG | AreaNames.RIGHT_LEG:
self._my_area.armor = self._inner_amor_store.get_leg_amore()
def _set_lines(self):
for key in range(6):
self._my_area.items[(1, key + 1)] = None
if self._is_big_area:
self._my_area.items[(2, key + 1)] = None
def add_item(self, area_item: Item) -> None:
self._area_item_factory.add_item(area_item)
def add_item(self, index: tuple[int, int], item: Item) -> None:
self._my_area.items[index] = item
self._watcher.add_item(item)
def set_item_to(self, index: tuple[int, int], area_item: Item) -> None:
self._area_item_factory.set_item_to(index, area_item)
@property
def area(self) -> Area:
return self._my_area
@property
def area_name(self):
return self.__area_name
@property
def areas(self) -> dict[AreaNames, Area]:
return {self.__area_name: self._my_area}
class AreaItemsFactory(AbstractMechFactory):
__reactor = None
__cockpit = None
__gyroskope = None
def __new__(cls, area_factory: AreaFactory):
if cls.__reactor is None:
cls.__reactor = cls._component_store.get_reaktor()
if cls.__cockpit is None:
cls.__cockpit = cls._item_store.get_cockpit()
if cls.__gyroskope is None:
cls.__gyroskope = cls._component_store.get_gyroskope()
instance = super().__new__(cls)
return instance
def __init__(self, area_factory: AreaFactory) -> None:
super().__init__()
self.__area_factory = area_factory
area_factory.area.items = dict()
self.__lines = area_factory.area.items
self._set_lines()
match self.__area_factory.area_name:
case AreaNames.HEAD:
self.__build_as_head()
case AreaNames.MIDDLE_TORSO:
self.__build_as_middle_torso()
case AreaNames.LEFT_TORSO | AreaNames.RIGHT_TORSO:
pass
case AreaNames.LEFT_ARM | AreaNames.RIGHT_ARM | AreaNames.LEFT_LEG | AreaNames.RIGHT_LEG:
self.__build_as_arm_leg()
def _set_lines(self):
for key in range(6):
self.__lines[(1, key + 1)] = None
if self.__area_factory.area_name.is_big():
self.__lines[(2, key + 1)] = None
def __build_as_head(self) -> None:
self.set_item_to((1, 1), self._item_store.get_sustainment(), )
self.set_item_to((1, 2), self._item_store.get_sensors(), )
self.set_item_to((1, 3), self.__cockpit, )
self.set_item_to((1, 5), self._item_store.get_sensors(), )
self.set_item_to((1, 6), self._item_store.get_sustainment(), )
self.__area_factory.area.cockpit = self.__cockpit
def __build_as_middle_torso(self) -> None:
self.set_item_to((1, 1), self.__reactor, )
self.set_item_to((1, 2), self.__reactor, )
self.set_item_to((1, 3), self.__reactor, )
self.set_item_to((1, 4), self.__gyroskope, )
self.set_item_to((1, 5), self.__gyroskope, )
self.set_item_to((1, 6), self.__gyroskope, )
self.set_item_to((2, 1), self.__gyroskope, )
self.set_item_to((2, 2), self.__reactor, )
self.set_item_to((2, 3), self.__reactor, )
self.set_item_to((2, 4), self.__reactor, )
self.__area_factory.area.reactor = self.__reactor
def __build_as_arm_leg(self) -> None:
self.set_item_to((1, 1), self._item_store.get_joint(), )
self.set_item_to((1, 2), self._item_store.get_activator(), )
self.set_item_to((1, 3), self._item_store.get_activator(), )
self.set_item_to((1, 4), self._item_store.get_activator(), )
def add_item(self, area_item: Item) -> None:
for (index, item) in self.__area_factory.area.items.items():
if item is not None:
continue
self.set_item_to(index, area_item)
return
raise UserWarning('no more space')
def set_item_to(self, index: tuple[int, int], area_item: Item) -> None:
self.__lines[index] = area_item
self._watcher.add_item(area_item)
@property
def outer_armors(self) -> dict[ZoneNames, OuterAmor]:
return self._my_zones
def area(self) -> Area:
return self.__area_factory.area
@property
def reactor(self) -> Reaktor:
return self.__reactor
@property
def cockpit(self) -> Cockpit:
return self.__cockpit
@property
def gyroskope(self) -> Gyroskope:
return self.__gyroskope
+2 -2
View File
@@ -1,6 +1,6 @@
import unittest
from mech_factory import MechFabrik
from mech_factory import MechBuilder
from mech_factory.component_storage import Area, AreaNames, ZoneNames
from mech_factory.component_storage.items import Item
@@ -47,7 +47,7 @@ NEXT_OUTER_ZONE = {
class AbstractTestMech(unittest.TestCase):
def setUp(self):
self.factory = MechFabrik('STP-6W Steppenwolf', 55.0, 5)
self.factory = MechBuilder('STP-6W Steppenwolf', 55.0, 5)
def _test_for_items(self, area: Area, should_list: list):
for (key, item_type) in should_list: