diff --git a/__pycache__/agent.cpython-38.pyc b/__pycache__/agent.cpython-38.pyc index 7fecea2..851941e 100644 Binary files a/__pycache__/agent.cpython-38.pyc and b/__pycache__/agent.cpython-38.pyc differ diff --git a/__pycache__/common.cpython-38.pyc b/__pycache__/common.cpython-38.pyc index 3523410..64eca0d 100644 Binary files a/__pycache__/common.cpython-38.pyc and b/__pycache__/common.cpython-38.pyc differ diff --git a/__pycache__/field.cpython-38.pyc b/__pycache__/field.cpython-38.pyc index fd34ce3..6acf55c 100644 Binary files a/__pycache__/field.cpython-38.pyc and b/__pycache__/field.cpython-38.pyc differ diff --git a/__pycache__/settings.cpython-38.pyc b/__pycache__/settings.cpython-38.pyc index 63ef744..ca9dbf7 100644 Binary files a/__pycache__/settings.cpython-38.pyc and b/__pycache__/settings.cpython-38.pyc differ diff --git a/trailer.py b/trailer.py index b44a0ab..6112dd5 100644 --- a/trailer.py +++ b/trailer.py @@ -1,32 +1,48 @@ -class Trailer: +from enum import Enum - def __init__(self, capacity, _type, priority, weight): - self.capacity = capacity +class Priorities(Enum): + SMALLEST = 0 + MEDIUM = 2 + HIGH = 3 + HIGHEST = 4 + + @staticmethod + def whatIsFirst(_prio1, _prio2): + if(_prio1 > _prio2): + return _prio1 + elif _prio2 >= _prio1: + return _prio2 + + +class Trailer: + def __init__(self, _type: str, priority: Priorities, weight: float): + self.capacity = 1.0 self.type = _type self.priority = priority - self.weight = weight + self.grossWeight = weight + def getWeight(self): + return self.grossWeight + self.capacity + + def use(self): + self.capacity -= 0.1 class Fertilizer(Trailer): # do nawożenia - def __init__(self): - super(Fertilizer, self).__init__(capacity=1, _type="Fertilizer", priority=1, weight=1) # parametry do uzupełnienia + super(Fertilizer, self).__init__("Fertilizer", Priorities.SMALLEST, 100) # parametry do uzupełnienia class Water(Trailer): # do podlewania - def __init__(self): - super(Water, self).__init__(capacity=1, _type="Water", priority=1, weight=1) # parametry do uzupełnienia + super(Water, self).__init__("Water", Priorities.HIGH, 2000) # parametry do uzupełnienia class Harvest(Trailer): # do zbierania - def __init__(self): - super(Harvest, self).__init__(capacity=1, _type="Harvest", priority=1, weight=1) # parametry do uzupełnienia + super(Harvest, self).__init__("Harvest", Priorities.SMALLEST, 500) # parametry do uzupełnienia class Sow(Trailer): # do siania - def __init__(self): - super(Sow, self).__init__(capacity=1, _type="Sow", priority=1, weight=1) # parametry do uzupełnienia + super(Sow, self).__init__("Sow", Priorities.HIGHEST, 200) # parametry do uzupełnienia